Mercurial Repositories > eric / changeset
changeset
Added configuration option to create backup files when reverting changes.
Fri, 09 Sep 2011 19:31:51 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 09 Sep 2011 19:31:51 +0200
- changeset 1312
- 12506dba74dc
- parent 1311
- 95685f9ad9f8
- child 1313
- 063bc4545f75
Added configuration option to create backup files when reverting changes.
diff -r 95685f9ad9f8 -r 12506dba74dc Plugins/PluginVcsMercurial.py --- a/Plugins/PluginVcsMercurial.py Fri Sep 09 19:15:06 2011 +0200 +++ b/Plugins/PluginVcsMercurial.py Fri Sep 09 19:31:51 2011 +0200 @@ -160,6 +160,7 @@ "ServerPort": 8000, "ServerStyle": "", "CleanupPatterns": "*.orig *.rej *~", + "CreateBackup": False, } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper @@ -203,7 +204,8 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", "PreferUnbundle"]: + if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", "PreferUnbundle", + "CreateBackup"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "ServerPort"]:
diff -r 95685f9ad9f8 -r 12506dba74dc Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py --- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Sep 09 19:15:06 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Sep 09 19:31:51 2011 +0200 @@ -39,6 +39,7 @@ self.preferUnbundleCheckBox.setChecked( self.__plugin.getPreferences("PreferUnbundle")) self.cleanupPatternEdit.setText(self.__plugin.getPreferences("CleanupPatterns")) + self.backupCheckBox.setChecked(self.__plugin.getPreferences("CreateBackup")) def save(self): """ @@ -51,6 +52,7 @@ self.__plugin.setPreferences("PreferUnbundle", self.preferUnbundleCheckBox.isChecked()) self.__plugin.setPreferences("CleanupPatterns", self.cleanupPatternEdit.text()) + self.__plugin.setPreferences("CreateBackup", self.backupCheckBox.isChecked()) @pyqtSlot() def on_configButton_clicked(self):
diff -r 95685f9ad9f8 -r 12506dba74dc Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui --- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Sep 09 19:15:06 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Sep 09 19:31:51 2011 +0200 @@ -10,7 +10,7 @@ <height>582</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -171,6 +171,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Revert</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QCheckBox" name="backupCheckBox"> + <property name="toolTip"> + <string>Select to create a backup file (.orig) before reverting changes</string> + </property> + <property name="text"> + <string>Create Backup Files</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox_5"> <property name="title"> <string>Cleanup</string> @@ -224,6 +243,7 @@ <tabstop>logBrowserCheckBox</tabstop> <tabstop>pullUpdateCheckBox</tabstop> <tabstop>preferUnbundleCheckBox</tabstop> + <tabstop>backupCheckBox</tabstop> <tabstop>cleanupPatternEdit</tabstop> <tabstop>configButton</tabstop> </tabstops>
diff -r 95685f9ad9f8 -r 12506dba74dc Plugins/VcsPlugins/vcsMercurial/hg.py --- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Sep 09 19:15:06 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Sep 09 19:31:51 2011 +0200 @@ -841,7 +841,8 @@ args = [] args.append('revert') self.addArguments(args, self.options['global']) - args.append("--no-backup") + if not self.getPlugin().getPreferences("CreateBackup"): + args.append("--no-backup") args.append("-v") if isinstance(name, list): dname, fnames = self.splitPathList(name)
diff -r 95685f9ad9f8 -r 12506dba74dc changelog --- a/changelog Fri Sep 09 19:15:06 2011 +0200 +++ b/changelog Fri Sep 09 19:31:51 2011 +0200 @@ -31,6 +31,7 @@ --- modified pull such, that it will try to apply an existing changegroups file first (created by an hg incoming) --- added support for importing patches + --- added configuration option to create backup files when reverting changes Version 5.2-snapshot-20110724: - bug fixes
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_cs.ts --- a/i18n/eric5_cs.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_cs.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15704,22 +15704,22 @@ <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -15734,112 +15734,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <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="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <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="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <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="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15849,37 +15849,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="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <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="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15889,22 +15889,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -24153,27 +24153,27 @@ <translation>Aktualizovat po stažení</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -24193,6 +24193,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Vrátit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -49782,30 +49797,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49816,23 +49831,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="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -49840,7 +49855,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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_de.ts --- a/i18n/eric5_de.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_de.ts Fri Sep 09 19:31:51 2011 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1640,8 +1641,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1859,7 +1860,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12588,7 +12589,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15350,167 +15351,167 @@ <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <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="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <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="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <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="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -15520,22 +15521,22 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -23641,27 +23642,27 @@ <translation>Nach Pull aktualisieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation>Editiere die Mercurial Konfigurationsdatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation>Konfigurationsdatei editieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation>Muster:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <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> @@ -23682,6 +23683,21 @@ <source>Prefer Unbundle</source> <translation>Unbundle vorziehen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation>Rückgängig machen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation>Auswählen, um eine Sicherungsdatei (.orig) vor dem Rückgängigmachen zu erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation>Sicherungsdateien erzeugen</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48923,24 +48939,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -48949,7 +48965,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48966,24 +48982,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -48994,7 +49010,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_en.ts --- a/i18n/eric5_en.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_en.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15266,167 +15266,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15436,22 +15436,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -23516,27 +23516,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -23556,6 +23556,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48489,30 +48504,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48523,23 +48538,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -48547,7 +48562,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_es.ts --- a/i18n/eric5_es.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_es.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15521,12 +15521,12 @@ <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -15541,17 +15541,17 @@ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <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="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -15561,142 +15561,142 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <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="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <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="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <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="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <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> @@ -15706,22 +15706,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -23968,27 +23968,27 @@ <translation>Hacer update despues de hacer pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation>Editar el archivo de configuración de mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation>Editar archivo de c onfiguración</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation>Limpiar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation>Patrón:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Intruducir el patrón de nombres de archivo a utilizar para la limpieza (entradas separadas por un caracter de espacio)</translation> </message> @@ -24008,6 +24008,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Revertir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -49258,17 +49273,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -49279,31 +49294,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -49312,7 +49327,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49329,7 +49344,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_fr.ts --- a/i18n/eric5_fr.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_fr.ts Fri Sep 09 19:31:51 2011 +0200 @@ -16851,22 +16851,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16876,147 +16876,147 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17026,22 +17026,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -25418,27 +25418,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -25458,6 +25458,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Recouvrir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -53706,30 +53721,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53740,23 +53755,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -53764,7 +53779,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_it.ts --- a/i18n/eric5_it.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_it.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15465,22 +15465,22 @@ <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -15495,147 +15495,147 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <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="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <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="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <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="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15645,22 +15645,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -23885,27 +23885,27 @@ <translation>Aggiorna dopo il pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">Pulisci</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -23925,6 +23925,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Inverti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -49171,24 +49186,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -49197,7 +49212,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49214,24 +49229,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -49241,7 +49256,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_ru.ts --- a/i18n/eric5_ru.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_ru.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15567,12 +15567,12 @@ <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -15587,17 +15587,17 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -15607,142 +15607,142 @@ <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15752,22 +15752,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -24004,27 +24004,27 @@ <translation>Обновлять рабочий каталог после загрузки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -24044,6 +24044,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Откатить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -49420,17 +49435,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -49441,30 +49456,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -49474,7 +49489,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49491,7 +49506,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_tr.ts --- a/i18n/eric5_tr.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_tr.ts Fri Sep 09 19:31:51 2011 +0200 @@ -15700,22 +15700,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -15730,147 +15730,147 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <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="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15880,22 +15880,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -24078,27 +24078,27 @@ <translation type="obsolete">Ayar dosyasını düzenle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">Temizle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -24118,6 +24118,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">Başa Dönme</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -49483,24 +49498,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -49509,7 +49524,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49526,23 +49541,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -49553,7 +49568,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
diff -r 95685f9ad9f8 -r 12506dba74dc i18n/eric5_zh_CN.GB2312.ts --- a/i18n/eric5_zh_CN.GB2312.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Sep 09 19:31:51 2011 +0200 @@ -16817,22 +16817,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16842,147 +16842,147 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -16992,22 +16992,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -25389,27 +25389,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> @@ -25429,6 +25429,21 @@ <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation type="unfinished">还原</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -53665,30 +53680,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53699,23 +53714,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -53723,7 +53738,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
