Mercurial Repositories > eric / changeset
changeset
Made the Mercurial cleanup patterns configurable.
Mon, 30 May 2011 19:50:55 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 30 May 2011 19:50:55 +0200
- changeset 1085
- ef6102d5fefe
- parent 1083
- dc680a0ce221
- child 1086
- b48ce064b224
Made the Mercurial cleanup patterns configurable.
--- a/Plugins/PluginVcsMercurial.py Mon May 30 19:23:59 2011 +0200 +++ b/Plugins/PluginVcsMercurial.py Mon May 30 19:50:55 2011 +0200 @@ -158,6 +158,7 @@ "PullUpdate": False, "ServerPort": 8000, "ServerStyle": "", + "CleanupPatterns": "*.orig *.rej", } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper @@ -205,13 +206,14 @@ return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "ServerPort"]: - return int(Preferences.Prefs.settings.value("Mercurial/" + key, - self.__mercurialDefaults[key])) + return int(Preferences.Prefs.settings.value( + "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["Commits"]: return Preferences.toList(Preferences.Prefs.settings.value( - "Mercurial/" + key)) + "Mercurial/" + key, self.__mercurialDefaults[key])) else: - return Preferences.Prefs.settings.value("Mercurial/" + key) + return Preferences.Prefs.settings.value( + "Mercurial/" + key, self.__mercurialDefaults[key]) def setPreferences(self, key, value): """
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Mon May 30 19:23:59 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Mon May 30 19:50:55 2011 +0200 @@ -36,6 +36,7 @@ self.commitSpinBox.setValue(self.__plugin.getPreferences("CommitMessages")) self.logBrowserCheckBox.setChecked(self.__plugin.getPreferences("UseLogBrowser")) self.pullUpdateCheckBox.setChecked(self.__plugin.getPreferences("PullUpdate")) + self.cleanupPatternEdit.setText(self.__plugin.getPreferences("CleanupPatterns")) def save(self): """ @@ -45,6 +46,7 @@ self.__plugin.setPreferences("CommitMessages", self.commitSpinBox.value()) self.__plugin.setPreferences("UseLogBrowser", self.logBrowserCheckBox.isChecked()) self.__plugin.setPreferences("PullUpdate", self.pullUpdateCheckBox.isChecked()) + self.__plugin.setPreferences("CleanupPatterns", self.cleanupPatternEdit.text()) @pyqtSlot() def on_configButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Mon May 30 19:23:59 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Mon May 30 19:50:55 2011 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>406</width> - <height>384</height> + <height>491</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -157,6 +157,29 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Cleanup</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Pattern:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="cleanupPatternEdit"> + <property name="toolTip"> + <string>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QPushButton" name="configButton"> <property name="toolTip"> <string>Edit the Mercurial configuration file</string> @@ -186,6 +209,7 @@ <tabstop>commitSpinBox</tabstop> <tabstop>logBrowserCheckBox</tabstop> <tabstop>pullUpdateCheckBox</tabstop> + <tabstop>cleanupPatternEdit</tabstop> <tabstop>configButton</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 30 19:23:59 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 30 19:50:55 2011 +0200 @@ -1000,8 +1000,7 @@ @param name directory name to be cleaned up (string) """ - # TODO: make this configurable - patterns = ['*.orig', '*.rej'] + patterns = self.getPlugin().getPreferences("CleanupPatterns").split() entries = [] for pat in patterns:
--- a/i18n/eric5_cs.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_cs.ts Mon May 30 19:50:55 2011 +0200 @@ -15552,132 +15552,132 @@ <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <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="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <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="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <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="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <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="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <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="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15687,37 +15687,37 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <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="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <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="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -23376,15 +23376,30 @@ <translation>Aktualizovat po stažení</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48533,30 +48548,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48567,23 +48582,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -48591,7 +48606,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_de.ts Mon May 30 19:50:55 2011 +0200 @@ -15292,167 +15292,167 @@ <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <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="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <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="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <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="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <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="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <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="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -23048,15 +23048,30 @@ <translation>Nach Pull aktualisieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation>Editiere die Mercurial Konfigurationsdatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation>Konfigurationsdatei editieren</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation>Muster:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation>Gib die Dateinamenmuster für das Aufräumen ein (Einträge durch Leerzeichen getrennt)</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47884,24 +47899,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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> @@ -47910,7 +47925,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47927,24 +47942,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -47955,7 +47970,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_en.ts Mon May 30 19:50:55 2011 +0200 @@ -15210,167 +15210,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <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="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <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="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22925,15 +22925,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47491,30 +47506,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47525,23 +47540,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -47549,7 +47564,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_es.ts Mon May 30 19:50:55 2011 +0200 @@ -15346,32 +15346,32 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <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="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <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="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -15386,137 +15386,137 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <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="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <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="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <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="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <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="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -23172,15 +23172,30 @@ <translation>Hacer update despues de hacer pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Limpiar (cleanup)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47970,17 +47985,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -47991,31 +48006,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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> @@ -48024,7 +48039,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48041,7 +48056,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_fr.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_fr.ts Mon May 30 19:50:55 2011 +0200 @@ -16765,167 +16765,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <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="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <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="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24747,15 +24747,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -52578,30 +52593,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52612,23 +52627,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -52636,7 +52651,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_it.ts Mon May 30 19:50:55 2011 +0200 @@ -15298,167 +15298,167 @@ <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <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="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <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="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <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="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <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="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <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="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <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="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <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="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -23098,15 +23098,30 @@ <translation>Aggiorna dopo il pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Pulisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47902,24 +47917,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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> @@ -47928,7 +47943,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47945,24 +47960,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -47972,7 +47987,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_ru.ts Mon May 30 19:50:55 2011 +0200 @@ -15395,32 +15395,32 @@ <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -15435,137 +15435,137 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -23217,15 +23217,30 @@ <translation>Обновлять рабочий каталог после загрузки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Очистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48151,17 +48166,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -48172,30 +48187,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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> @@ -48205,7 +48220,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48222,7 +48237,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_tr.ts Mon May 30 19:50:55 2011 +0200 @@ -15553,167 +15553,167 @@ <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <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="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <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="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <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="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <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="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <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="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -23331,15 +23331,30 @@ <translation type="obsolete">Ayar dosyasını düzenle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">Temizle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48264,24 +48279,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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> @@ -48290,7 +48305,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48307,23 +48322,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -48334,7 +48349,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon May 30 19:23:59 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon May 30 19:50:55 2011 +0200 @@ -16731,167 +16731,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> <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="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> <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="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24718,15 +24718,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -52537,30 +52552,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> <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="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <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="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/> <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="1112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <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="1136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52571,23 +52586,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> <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="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/> <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> @@ -52595,7 +52610,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
