--- 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>