--- a/i18n/eric5_cs.ts Thu Aug 01 19:12:57 2013 +0200 +++ b/i18n/eric5_cs.ts Fri Aug 02 16:29:25 2013 +0200 @@ -18610,7 +18610,7 @@ <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -18670,27 +18670,27 @@ <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -18705,112 +18705,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <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="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <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="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> <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="2113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <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="2138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> <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="2184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <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="2047"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <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="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> <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="2295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -18820,37 +18820,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="2429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> <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="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> <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="2312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <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="2615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18860,72 +18860,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> <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="3178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -18940,37 +18940,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -20861,7 +20861,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -20891,17 +20891,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1226"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1223"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -20976,92 +20976,92 @@ <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="409"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> - <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> + <source>Enter data to be sent to the hg process</source> + <translation>Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="467"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="470"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="473"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/> <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/HgLogBrowserDialog.py" line="503"/> - <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/HgLogBrowserDialog.py" line="506"/> - <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> + <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/HgLogBrowserDialog.py" line="509"/> + <source>Could not start the hg executable.</source> + <translation>Nelze spustit hg program.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="512"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -21101,22 +21101,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -21126,12 +21126,12 @@ <translation type="obsolete">Obnovit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -21162,15 +21162,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="385"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -21190,168 +21200,178 @@ <translation><b>Mercurial Log</b><p>Zobrazuje výstup z hg log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="51"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="98"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="101"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> + <source>Alt+S</source> + <translation></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> + <source>Enter data to be sent to the hg process</source> + <translation>Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/> <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="270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="324"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="329"/> <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="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <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="239"/> - <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="242"/> + <source>Could not start the hg executable.</source> + <translation>Nelze spustit hg program.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="245"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="339"/> <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="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -21818,17 +21838,17 @@ <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> @@ -62780,23 +62800,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/> <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="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <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="1949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/> <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="1324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/> <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> @@ -62814,23 +62834,23 @@ <translation type="obsolete"><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <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="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <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="1953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> <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="1956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> <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> @@ -62838,12 +62858,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>