--- a/i18n/eric5_cs.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_cs.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15619,42 +15619,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15664,167 +15664,167 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>Mercurial log</translation> + <translation type="obsolete">Mercurial log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Vyberte počet položek, které se mají zobrazit.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <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="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <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="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <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="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15834,57 +15834,57 @@ <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="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <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="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16475,103 +16475,128 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Vybrat pro zadání revize číslem</translation> + <translation type="obsolete">Vybrat pro zadání revize číslem</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Číslo</translation> + <translation type="obsolete">Číslo</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Zadejte číslo revize</translation> + <translation type="obsolete">Zadejte číslo revize</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> - <translation>Vybrat pro zadání revize přes id množiny změn</translation> + <translation type="obsolete">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> <source>Id:</source> - <translation>Id:</translation> + <translation type="obsolete">Id:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Zadejte id množiny změn</translation> + <translation type="obsolete">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Větev:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Vybrat pro specifikaci revize tagem</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Tag:</translation> + <source>Enter a branch name</source> + <translation>Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Vybrat pro specifikaci konkrétní revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Vybrat pro zabalení množin změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Zabalit všechny množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Zadejte jméno tagu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Vybrat pro specifikaci revize přes větev</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Větev:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Zadejte jméno větve</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Vybrat pro specifikaci konkrétní revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Vybrat pro zabalení množin změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Zabalit všechny množiny změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17581,98 +17606,98 @@ <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17787,6 +17812,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18822,12 +18930,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> - <translation>Přeskočit aktuální množinu změn</translation> + <translation type="obsolete">Přeskočit aktuální množinu změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> + <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> @@ -19079,6 +19187,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35510,182 +35633,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Vytvořit projekt v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Projekt nemůže být v repozitáři vytvořen. Buďto daný repozitář neexistuje nebo se nelze připojit k serveru s repozitářem.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Projekt se nepodařilo stáhnout (checkout) z repozitáře. <br />Obnovuji původní obsah.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Importovat projekt do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Tag musí být normální tag (tagy) nebo tag větve (větví). Prosím vyberte ze seznamu.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Checkout projektu ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Exportuje projekt z Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Commit změn do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation></translation> </message> @@ -35840,37 +35963,37 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -35890,53 +36013,53 @@ <translation>Seznam změn byl přesunut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>Inportovaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -42275,68 +42398,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -49440,30 +49558,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49474,23 +49592,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="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -49498,7 +49616,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="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -49742,17 +49860,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>