--- a/i18n/eric5_cs.ts Mon Mar 25 15:42:11 2013 +0100 +++ b/i18n/eric5_cs.ts Mon Mar 25 18:15:32 2013 +0100 @@ -18548,17 +18548,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <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="2983"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -18578,42 +18578,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="2761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <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="2825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2826"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20426,12 +20426,12 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1202"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Author</source> <translation>Autor</translation> </message> @@ -20511,52 +20511,52 @@ <translation>&Porovnat revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <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="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <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="430"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <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="447"/> - <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="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> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation></translation> </message> @@ -20576,27 +20576,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="700"/> <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="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="502"/> <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="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="505"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -20676,21 +20676,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> + <source>Press to copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1352"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> </context> <context> <name>HgLogDialog</name>