Wed, 19 Mar 2014 18:47:05 +0100
Changed a few Mercurial dialogs asking the user for the selection of a revision to be more accurate.
--- a/APIs/Python3/eric5.api Wed Mar 19 18:42:09 2014 +0100 +++ b/APIs/Python3/eric5.api Wed Mar 19 18:47:05 2014 +0100 @@ -4674,7 +4674,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_idEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_tagButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, showNone=False, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, noneLabel="", parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.getRevisions?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark1Button_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged?4(txt)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Wed Mar 19 18:42:09 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Wed Mar 19 18:47:05 2014 +0100 @@ -97,7 +97,7 @@ </table> <a NAME="HgRevisionSelectionDialog.__init__" ID="HgRevisionSelectionDialog.__init__"></a> <h4>HgRevisionSelectionDialog (Constructor)</h4> -<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, showNone=False, parent=None</i>) +<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, noneLabel="", parent=None</i>) <p> Constructor </p><dl> @@ -110,10 +110,9 @@ </dd><dt><i>bookmarksList</i></dt> <dd> list of bookmarks (list of strings) -</dd><dt><i>showNone</i></dt> +</dd><dt><i>noneLabel</i></dt> <dd> -flag influencing the label of the 'None' selection - (boolean) +labeltext for "no revision selected" (string) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -206,7 +206,7 @@ <string>Select tip revision of repository</string> </property> <property name="text"> - <string>TIP</string> + <string>Parent</string> </property> <property name="checked"> <bool>true</bool>
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -175,7 +175,7 @@ <string>Select tip revision of repository</string> </property> <property name="text"> - <string>TIP</string> + <string>Parent</string> </property> <property name="checked"> <bool>true</bool>
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -175,7 +175,7 @@ <string>Select to not specify a specific revision</string> </property> <property name="text"> - <string>No revision selected</string> + <string>Parent</string> </property> <property name="checked"> <bool>true</bool>
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Wed Mar 19 18:47:05 2014 +0100 @@ -18,15 +18,14 @@ Class implementing a dialog to select a revision. """ def __init__(self, tagsList, branchesList, bookmarksList=None, - showNone=False, parent=None): + noneLabel="", parent=None): """ Constructor @param tagsList list of tags (list of strings) @param branchesList list of branches (list of strings) @param bookmarksList list of bookmarks (list of strings) - @param showNone flag influencing the label of the 'None' selection - (boolean) + @param noneLabel labeltext for "no revision selected" (string) @param parent parent widget (QWidget) """ super().__init__(parent) @@ -42,10 +41,8 @@ self.bookmarkButton.setHidden(True) self.bookmarkCombo.setHidden(True) - if showNone: - self.tipButton.setText(self.tr("No revision selected")) - self.tipButton.setToolTip(self.tr( - "Select to not specify a specific revision")) + if noneLabel: + self.noneButton.setText(noneLabel) msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) @@ -154,6 +151,8 @@ rev = self.branchCombo.currentText() elif self.bookmarkButton.isChecked(): rev = self.bookmarkCombo.currentText() + elif self.tipButton.isChecked(): + rev = "tip" else: rev = ""
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>372</width> - <height>276</height> + <height>250</height> </rect> </property> <property name="windowTitle"> @@ -177,6 +177,13 @@ <property name="text"> <string>TIP</string> </property> + </widget> + </item> + <item row="6" column="0" colspan="3"> + <widget class="QRadioButton" name="noneButton"> + <property name="text"> + <string>No revision selected</string> + </property> <property name="checked"> <bool>true</bool> </property> @@ -209,6 +216,7 @@ <tabstop>bookmarkButton</tabstop> <tabstop>bookmarkCombo</tabstop> <tabstop>tipButton</tabstop> + <tabstop>noneButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Wed Mar 19 18:47:05 2014 +0100 @@ -237,6 +237,7 @@ bookmarkCombo = self.bookmark1Combo tipButton = self.tip1Button prevButton = self.prev1Button + noneButton = self.none1Button else: numberButton = self.number2Button numberSpinBox = self.number2SpinBox @@ -250,6 +251,7 @@ bookmarkCombo = self.bookmark2Combo tipButton = self.tip2Button prevButton = self.prev2Button + noneButton = self.none2Button if numberButton.isChecked(): return "rev({0})".format(numberSpinBox.value()) @@ -265,6 +267,8 @@ return "tip" elif prevButton.isChecked(): return "." + elif noneButton.isChecked(): + return "" def getRevisions(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>371</width> - <height>565</height> + <height>505</height> </rect> </property> <property name="windowTitle"> @@ -186,6 +186,13 @@ </property> </widget> </item> + <item row="7" column="0" colspan="3"> + <widget class="QRadioButton" name="none1Button"> + <property name="text"> + <string>No revision selected</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -352,6 +359,13 @@ </property> </widget> </item> + <item row="7" column="0" colspan="3"> + <widget class="QRadioButton" name="none2Button"> + <property name="text"> + <string>No revision selected</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -382,6 +396,7 @@ <tabstop>bookmark1Combo</tabstop> <tabstop>tip1Button</tabstop> <tabstop>prev1Button</tabstop> + <tabstop>none1Button</tabstop> <tabstop>number2Button</tabstop> <tabstop>number2SpinBox</tabstop> <tabstop>id2Button</tabstop> @@ -394,6 +409,7 @@ <tabstop>bookmark2Combo</tabstop> <tabstop>tip2Button</tabstop> <tabstop>prev2Button</tabstop> + <tabstop>none2Button</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui Wed Mar 19 18:47:05 2014 +0100 @@ -370,7 +370,7 @@ <string>Select tip revision of repository</string> </property> <property name="text"> - <string>TIP</string> + <string>Current branch tip</string> </property> <property name="checked"> <bool>true</bool>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 19 18:42:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 19 18:47:05 2014 +0100 @@ -1083,7 +1083,8 @@ from .HgRevisionSelectionDialog import HgRevisionSelectionDialog dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList) + bookmarksList, + self.tr("Current branch tip")) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() return self.vcsUpdate(name, revision=rev) @@ -2659,8 +2660,7 @@ from .HgRevisionSelectionDialog import HgRevisionSelectionDialog dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), - bookmarksList, - showNone=True) + bookmarksList) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() else:
--- a/i18n/eric5_cs.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_cs.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19895,7 +19895,7 @@ <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -19970,12 +19970,12 @@ <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -19990,17 +19990,17 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> @@ -20015,52 +20015,52 @@ <translation type="obsolete">Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> @@ -20070,22 +20070,22 @@ <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> @@ -20095,7 +20095,7 @@ <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -20105,12 +20105,12 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> @@ -20125,7 +20125,7 @@ <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -20245,17 +20245,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -20265,10 +20265,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20619,7 +20624,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> + <translation type="obsolete">Nebyla vybrána revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> @@ -20686,6 +20691,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -20797,13 +20807,18 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -21829,7 +21844,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> @@ -21881,6 +21896,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -25244,7 +25264,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> @@ -25286,6 +25306,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -25496,14 +25521,14 @@ <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Nebyla vybrána revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> <source>Select to not specify a specific revision</source> - <translation>Vybrat pro specifikaci konkrétní revize</translation> + <translation type="obsolete">Vybrat pro specifikaci konkrétní revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> @@ -25534,105 +25559,110 @@ <translation>Revize &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Zadejte id množiny změn</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Zadejte id množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Vybrat pro specifikaci revize tagem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Vybrat pro specifikaci revize přes větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Vybrat revizi před posledním zapsáním změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Revize &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">Nebyla vybrána revize</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -65900,23 +65930,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -65934,23 +65964,23 @@ <translation type="obsolete"><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -65958,12 +65988,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_de.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_de.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19034,7 +19034,7 @@ <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -19099,77 +19099,77 @@ <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <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="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <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="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <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="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <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="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <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="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> @@ -19179,22 +19179,22 @@ <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <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> @@ -19204,17 +19204,17 @@ <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> @@ -19229,7 +19229,7 @@ <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> @@ -19349,17 +19349,17 @@ <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <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> @@ -19369,10 +19369,15 @@ <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation>Spitze des aktuellen Zweigs</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -19716,11 +19721,6 @@ <translation>Auswählen, um keine spezifische Revision zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>No revision selected</source> - <translation>Keine Revision ausgewählt</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Änderungsdaten</translation> @@ -19785,6 +19785,11 @@ <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation>Vorgänger</translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -19894,15 +19899,15 @@ <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>TIP</source> - <translation>TIP</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation>Vorgänger</translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -20902,11 +20907,6 @@ <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>TIP</source> - <translation>TIP</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation>Änderungsbeschreibung</translation> @@ -20956,6 +20956,11 @@ <source>Force Signature</source> <translation>Signatur erzwingen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation>Vorgänger</translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -24134,11 +24139,6 @@ <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> - <source>TIP</source> - <translation>TIP</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation>Auswählen, um die umgruppierten Änderungssätze zusammenzufassen</translation> @@ -24178,6 +24178,11 @@ <source>Detach Source</source> <translation>Quelle trennen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation>Spitze des aktuellen Zweigs</translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -24388,16 +24393,11 @@ <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Keine Revision ausgewählt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> - <source>Select to not specify a specific revision</source> - <translation>Auswählen, um keine spezifische Revision zu wählen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> @@ -24426,105 +24426,110 @@ <translation>Revision &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Auswählen, um eine Revision mit ihrer Änderungssatz-ID anzugeben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Gib die Änderungssatz ID ein</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Auswählen, um eine Revision per Marke zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Wähle Revision for letztem Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Revision &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -62382,24 +62387,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -62408,24 +62413,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -62436,12 +62441,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_en.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_en.ts Wed Mar 19 18:47:05 2014 +0100 @@ -18930,7 +18930,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -18995,117 +18995,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <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="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> @@ -19245,17 +19245,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -19265,10 +19265,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -19612,11 +19617,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> @@ -19681,6 +19681,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -19790,15 +19795,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -20774,11 +20779,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished"></translation> @@ -20828,6 +20828,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -23987,11 +23992,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> @@ -24031,6 +24031,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -24241,16 +24246,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> @@ -24279,105 +24279,110 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -61828,46 +61833,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -61875,12 +61880,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_es.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_es.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19034,7 +19034,7 @@ <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> @@ -19094,22 +19094,22 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <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="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <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="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -19119,57 +19119,57 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <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="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> @@ -19179,22 +19179,22 @@ <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> @@ -19204,17 +19204,17 @@ <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> @@ -19229,7 +19229,7 @@ <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> @@ -19349,17 +19349,17 @@ <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <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> @@ -19369,10 +19369,15 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -19718,7 +19723,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>No revision selected</source> - <translation>No se ha seleccionado revisión</translation> + <translation type="obsolete">No se ha seleccionado revisión</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> @@ -19785,6 +19790,11 @@ <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Padre</translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -19896,13 +19906,18 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> <source>TIP</source> - <translation>TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished">Padre</translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -20904,7 +20919,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> <source>TIP</source> - <translation>TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> @@ -20956,6 +20971,11 @@ <source>Force Signature</source> <translation>Forzar Firma</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Padre</translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -24138,7 +24158,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> - <translation>TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> @@ -24180,6 +24200,11 @@ <source>Detach Source</source> <translation>Desacoplar Fuente</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -24390,14 +24415,14 @@ <translation>Introducir un nombre de branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>No se ha seleccionado revisión</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> <source>Select to not specify a specific revision</source> - <translation>Seleccionar para no especificar una revisión específica</translation> + <translation type="obsolete">Seleccionar para no especificar una revisión específica</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> @@ -24428,105 +24453,110 @@ <translation>Revisión &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Seleccionar para especificar una revisión por número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Introduzca un changeset id</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Introduzca un changeset id</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Seleccionar para especificar una revisión por tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Seleccionar para especificar una revisión por una branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Seleccionar revisión tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Seleccionar revisión antes del último commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Revisión &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation>Seleccionar para especificar una revisión por marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">No se ha seleccionado revisión</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -62335,17 +62365,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -62356,31 +62386,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -62389,12 +62419,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_fr.ts Wed Mar 19 18:47:05 2014 +0100 @@ -20909,7 +20909,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -20974,12 +20974,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -20989,67 +20989,67 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> @@ -21059,22 +21059,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -21084,17 +21084,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> @@ -21109,7 +21109,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -21229,17 +21229,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -21249,10 +21249,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21601,11 +21606,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> @@ -21670,6 +21670,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -21779,15 +21784,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -22793,11 +22798,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Message de commit</translation> @@ -22847,6 +22847,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -26132,11 +26137,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> @@ -26176,6 +26176,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -26386,16 +26391,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> @@ -26424,105 +26424,110 @@ <translation type="unfinished">Révision &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation type="unfinished">Numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation type="unfinished">Sélectionne la révision avant la dernière validation</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation type="unfinished">PREC</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation type="unfinished">Révision &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -69504,24 +69509,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <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>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -69547,23 +69552,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -69574,12 +69579,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_it.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_it.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19820,7 +19820,7 @@ <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> @@ -19895,12 +19895,12 @@ <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -19915,17 +19915,17 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> @@ -19940,52 +19940,52 @@ <translation type="obsolete">Inserisci il nome del Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> @@ -19995,22 +19995,22 @@ <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> @@ -20020,17 +20020,17 @@ <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> @@ -20045,7 +20045,7 @@ <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> @@ -20165,17 +20165,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -20185,10 +20185,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20539,7 +20544,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>No revision selected</source> - <translation>Nessuna revisione selezionata</translation> + <translation type="obsolete">Nessuna revisione selezionata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> @@ -20606,6 +20611,11 @@ <source>Enter a bookmark name</source> <translation>Digita un nome per il segnalibro</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Genitore</translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -20712,7 +20722,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> @@ -20724,6 +20734,11 @@ <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished">Genitore</translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -21749,7 +21764,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> @@ -21801,6 +21816,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Genitore</translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -25168,7 +25188,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> @@ -25210,6 +25230,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -25420,14 +25445,14 @@ <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Nessuna revisione selezionata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> <source>Select to not specify a specific revision</source> - <translation>Seleziona per non indicare una specifica revisione</translation> + <translation type="obsolete">Seleziona per non indicare una specifica revisione</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> @@ -25458,105 +25483,110 @@ <translation>Revisione &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Seleziona per specificare una revisione con un numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Inserisci id del changeset</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Inserisci id del changeset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Seleziona per specificare una revisione con un tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Inserisci il nome del tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Seleziona per specificare una revisione con un branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Inserisci un nome di branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Seleziona la revisione tip del reposutory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Seleziona la revisione prima dell'ultima commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Revisione &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation>Seleziona per specificare una revisione tramite segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation>Segnalibro:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation>Digita un nome per il segnalibro</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">Nessuna revisione selezionata</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -66418,24 +66448,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -66461,24 +66491,24 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -66488,12 +66518,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_ru.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_ru.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19939,7 +19939,7 @@ <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> @@ -20004,7 +20004,7 @@ <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -20019,17 +20019,17 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -20044,7 +20044,7 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> @@ -20059,52 +20059,52 @@ <translation type="obsolete">Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> @@ -20114,22 +20114,22 @@ <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> @@ -20139,17 +20139,17 @@ <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> @@ -20164,7 +20164,7 @@ <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -20284,17 +20284,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -20304,10 +20304,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20658,7 +20663,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>No revision selected</source> - <translation>Ревизия не выбрана</translation> + <translation type="obsolete">Ревизия не выбрана</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> @@ -20725,6 +20730,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -20836,13 +20846,18 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> <source>TIP</source> - <translation>TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation>Вернуть закладку</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -21863,7 +21878,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> @@ -21915,6 +21930,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -25292,7 +25312,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> @@ -25334,6 +25354,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -25544,14 +25569,14 @@ <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Ревизия не выбрана</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> + <translation type="obsolete">Не задавать конкретную ревизию</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> @@ -25582,105 +25607,110 @@ <translation>Ревизия &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Задайте идентификатор изменений</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Задайте идентификатор изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Задать ревизию с помощью метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Выбрать ревизию перед последней подачей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Ревизия &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">Ревизия не выбрана</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -66583,17 +66613,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -66604,30 +66634,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -66654,12 +66684,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_tr.ts Wed Mar 19 18:47:05 2014 +0100 @@ -19873,7 +19873,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -19938,12 +19938,12 @@ <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -19958,17 +19958,17 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> @@ -19983,87 +19983,87 @@ <translation type="obsolete">Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> @@ -20088,7 +20088,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -20208,17 +20208,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -20228,10 +20228,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20582,7 +20587,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>No revision selected</source> - <translation>Seçilmiş gözden geçirme yok</translation> + <translation type="obsolete">Seçilmiş gözden geçirme yok</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> @@ -20649,6 +20654,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -20758,15 +20768,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -21787,11 +21797,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Teslimat mesajı</translation> @@ -21841,6 +21846,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -25091,11 +25101,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> @@ -25135,6 +25140,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -25345,16 +25355,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Seçilmiş gözden geçirme yok</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> @@ -25383,105 +25388,110 @@ <translation>Gözden Geçirme &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Gözden geçirme numarasının açıkça belirtmeyi seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Numara</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation>Değişiklik set kimliğini gir</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation>Değişiklik set kimliğini gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Etiket adı gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Bir branş adı giriniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Son teslimattan önce gözden geçirmeyi seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Gözden Geçirme &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">Seçilmiş gözden geçirme yok</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -65248,24 +65258,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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> @@ -65291,23 +65301,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -65318,12 +65328,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Mar 19 18:42:09 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Mar 19 18:47:05 2014 +0100 @@ -20824,7 +20824,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -20889,12 +20889,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1316"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1536"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -20904,67 +20904,67 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2374"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> @@ -20974,22 +20974,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -20999,17 +20999,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> @@ -21024,7 +21024,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -21144,17 +21144,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -21164,10 +21164,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21516,11 +21521,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> @@ -21585,6 +21585,11 @@ <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -21694,15 +21699,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -22708,11 +22713,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">提交消息</translation> @@ -22762,6 +22762,11 @@ <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -26052,11 +26057,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> - <source>TIP</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> @@ -26096,6 +26096,11 @@ <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -26306,16 +26311,11 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> @@ -26344,105 +26344,110 @@ <translation type="unfinished">修订 &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation type="unfinished">选择通过号码指定一个修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation type="unfinished">号码</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation type="unfinished">选择在最后提交之前修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation type="unfinished">以前的</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation type="unfinished">修订 &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -69385,46 +69390,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/> <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="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -69432,12 +69437,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>