--- a/i18n/eric5_cs.ts Fri Dec 23 15:29:00 2011 +0100 +++ b/i18n/eric5_cs.ts Fri Dec 23 17:48:33 2011 +0100 @@ -17306,77 +17306,77 @@ <translation>Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="35"/> <source><b>Mercurial Diff</b><p>This shows the output of the hg diff command.</p></source> <translation><b>Mercurial Diff</b><p>Zobrazuje se výstup z hg příkazu diff.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="85"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> - <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/HgDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>Ode&slat</translation> + <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/HgDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="120"/> <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/HgDiffDialog.ui" line="124"/> - <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/HgDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>Ty&p heslo</translation> + <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/HgDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>Ty&p heslo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <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/HgDiffDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> @@ -17386,20 +17386,30 @@ <translation type="obsolete"><p>Patch soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="115"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgExportDialog</name> @@ -37471,7 +37481,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>Subversion Diff</source> <translation></translation> </message> @@ -37481,82 +37491,82 @@ <translation>Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="35"/> <source><b>Subversion Diff</b><p>This shows the output of the svn diff command.</p></source> <translation><b>Subversion Diff</b><p>Zobrazuje se výstup ze svn příkazu diff.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="85"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="104"/> - <source>Press to send the input to the subversion process</source> - <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>Ode&slat</translation> + <source>Press to send the input to the subversion process</source> + <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="120"/> <source>Enter data to be sent to the subversion process</source> <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="124"/> - <source>Select to switch the input field to password mode</source> - <translation>Výběr přepnutí vstupního pole na mód zadání hesla</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> + <source>Select to switch the input field to password mode</source> + <translation>Výběr přepnutí vstupního pole na mód zadání hesla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>Mód ve&psání hesla</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="250"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="393"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>There is no temporary directory available.</source> <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <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> @@ -37566,21 +37576,31 @@ <translation type="obsolete"><p>Patch soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="200"/> <source>Processing file '{0}'... </source> <translation>Spouštím proces '{0}'...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="410"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="317"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnInfoDialog</name>