--- a/i18n/eric6_cs.ts Fri Jun 23 18:46:40 2017 +0200 +++ b/i18n/eric6_cs.ts Sat Jun 24 12:15:03 2017 +0200 @@ -4366,7 +4366,7 @@ <translation>Stisknout pro provedení porovnání dvou souborů</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="253"/> + <location filename="../UI/CompareDialog.py" line="262"/> <source>Compare Files</source> <translation>Porovnat soubory</translation> </message> @@ -4386,27 +4386,27 @@ <translation>&Synchronizovat vodorovné posuvníky</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="358"/> + <location filename="../UI/CompareDialog.py" line="369"/> <source>Total: {0}</source> <translation>Celkem: {0}</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="360"/> + <location filename="../UI/CompareDialog.py" line="371"/> <source>Changed: {0}</source> <translation>Změněno: {0}</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="361"/> + <location filename="../UI/CompareDialog.py" line="372"/> <source>Added: {0}</source> <translation>Přidáno: {0}</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="362"/> + <location filename="../UI/CompareDialog.py" line="373"/> <source>Deleted: {0}</source> <translation>Smazáno: {0}</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="253"/> + <location filename="../UI/CompareDialog.py" line="262"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> @@ -4452,62 +4452,62 @@ <translation>CORBA</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="144"/> + <location filename="../Preferences/ConfigurationDialog.py" line="147"/> <source>Email</source> <translation>Email</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="147"/> + <location filename="../Preferences/ConfigurationDialog.py" line="150"/> <source>Graphics</source> <translation>Grafika</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="153"/> + <location filename="../Preferences/ConfigurationDialog.py" line="156"/> <source>Icons</source> <translation>Ikony</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="172"/> + <location filename="../Preferences/ConfigurationDialog.py" line="175"/> <source>Plugin Manager</source> <translation>Plugin Manažer</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="440"/> + <location filename="../Preferences/ConfigurationDialog.py" line="443"/> <source>Printer</source> <translation>Tiskárna</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="211"/> + <location filename="../Preferences/ConfigurationDialog.py" line="214"/> <source>Python</source> <translation>Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="182"/> + <location filename="../Preferences/ConfigurationDialog.py" line="185"/> <source>Qt</source> <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="188"/> - <source>Shell</source> - <translation>Shell</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="191"/> - <source>Tasks</source> - <translation>Úlohy</translation> + <source>Shell</source> + <translation>Shell</translation> </message> <message> <location filename="../Preferences/ConfigurationDialog.py" line="194"/> + <source>Tasks</source> + <translation>Úlohy</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="197"/> <source>Templates</source> <translation>Šablony</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="200"/> + <location filename="../Preferences/ConfigurationDialog.py" line="203"/> <source>Version Control Systems</source> <translation>Version Control Systems</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="205"/> + <location filename="../Preferences/ConfigurationDialog.py" line="208"/> <source>Debugger</source> <translation>Debugger</translation> </message> @@ -4517,163 +4517,163 @@ <translation type="obsolete">Ruby</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="218"/> + <location filename="../Preferences/ConfigurationDialog.py" line="221"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="221"/> - <source>APIs</source> - <translation>APIs</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="224"/> + <source>APIs</source> + <translation>APIs</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="227"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="232"/> + <location filename="../Preferences/ConfigurationDialog.py" line="235"/> <source>Calltips</source> <translation>Rychlé tipy</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="238"/> + <location filename="../Preferences/ConfigurationDialog.py" line="241"/> <source>General</source> <translation>Hlavní</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="258"/> - <source>Typing</source> - <translation>Psaní</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="261"/> + <source>Typing</source> + <translation>Psaní</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="264"/> <source>Exporters</source> <translation>Exportery</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="265"/> + <location filename="../Preferences/ConfigurationDialog.py" line="268"/> <source>Highlighters</source> <translation>Zvýrazňovače</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="269"/> + <location filename="../Preferences/ConfigurationDialog.py" line="272"/> <source>Filetype Associations</source> <translation>Asociace typů souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="273"/> + <location filename="../Preferences/ConfigurationDialog.py" line="276"/> <source>Styles</source> <translation>Styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="289"/> + <location filename="../Preferences/ConfigurationDialog.py" line="292"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="447"/> + <location filename="../Preferences/ConfigurationDialog.py" line="450"/> <source>Help Documentation</source> <translation>Dokumenty nápovědy</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="296"/> + <location filename="../Preferences/ConfigurationDialog.py" line="299"/> <source>Help Viewers</source> <translation>Prohlížeče nápovědy</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="307"/> - <source>Project</source> - <translation>Projekt</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="304"/> - <source>Project Viewer</source> - <translation>Prohlížeč projektu</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="310"/> + <source>Project</source> + <translation>Projekt</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="307"/> + <source>Project Viewer</source> + <translation>Prohlížeč projektu</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="313"/> <source>Multiproject</source> <translation>Multiprojekt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="434"/> + <location filename="../Preferences/ConfigurationDialog.py" line="437"/> <source>Interface</source> <translation>Interface</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="321"/> + <location filename="../Preferences/ConfigurationDialog.py" line="324"/> <source>Viewmanager</source> <translation>Viewmanager</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="714"/> + <location filename="../Preferences/ConfigurationDialog.py" line="717"/> <source>Configuration Page Error</source> <translation>Chyba na straně konfigurace</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="241"/> + <location filename="../Preferences/ConfigurationDialog.py" line="244"/> <source>Filehandling</source> <translation>Manažer souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="245"/> + <location filename="../Preferences/ConfigurationDialog.py" line="248"/> <source>Searching</source> <translation>Vyhledávání</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="452"/> + <location filename="../Preferences/ConfigurationDialog.py" line="455"/> <source>Appearance</source> <translation>Vzhled</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="235"/> + <location filename="../Preferences/ConfigurationDialog.py" line="238"/> <source>QScintilla</source> <translation>QScintilla</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="252"/> + <location filename="../Preferences/ConfigurationDialog.py" line="255"/> <source>Style</source> <translation>Styl</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="283"/> + <source>Properties</source> + <translation>Nastavení</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="639"/> + <source>Preferences</source> + <translation>Předvolby</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="644"/> + <source>Please select an entry of the list +to display the configuration page.</source> + <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="440"/> + <source>Network</source> + <translation>Síť</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="471"/> + <source>Spell checking</source> + <translation>Kontrola pravopisu</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="217"/> + <source>Python3</source> + <translation></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="717"/> + <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> + <translation><p>Konfigurační stranu <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> <location filename="../Preferences/ConfigurationDialog.py" line="280"/> - <source>Properties</source> - <translation>Nastavení</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="636"/> - <source>Preferences</source> - <translation>Předvolby</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="641"/> - <source>Please select an entry of the list -to display the configuration page.</source> - <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="437"/> - <source>Network</source> - <translation>Síť</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="468"/> - <source>Spell checking</source> - <translation>Kontrola pravopisu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="214"/> - <source>Python3</source> - <translation></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="714"/> - <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> - <translation><p>Konfigurační stranu <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="277"/> <source>Keywords</source> <translation>Klíčová slova</translation> </message> @@ -4683,75 +4683,80 @@ <translation>Spolupráce</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="484"/> + <location filename="../Preferences/ConfigurationDialog.py" line="487"/> <source>Tray Starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="463"/> + <location filename="../Preferences/ConfigurationDialog.py" line="466"/> <source>VirusTotal Interface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="443"/> + <location filename="../Preferences/ConfigurationDialog.py" line="446"/> <source>Security</source> <translation type="unfinished">Bezpečnost</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="168"/> + <location filename="../Preferences/ConfigurationDialog.py" line="171"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="156"/> - <source>IRC</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="255"/> - <source>Code Checkers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationDialog.py" line="455"/> - <source>eric6 Web Browser</source> - <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="159"/> - <source>Log-Viewer</source> - <translation type="unfinished">Prohlížeč logu</translation> + <source>IRC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="258"/> + <source>Code Checkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="458"/> + <source>eric6 Web Browser</source> + <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation> </message> <message> <location filename="../Preferences/ConfigurationDialog.py" line="162"/> + <source>Log-Viewer</source> + <translation type="unfinished">Prohlížeč logu</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="165"/> <source>Mimetypes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="574"/> + <location filename="../Preferences/ConfigurationDialog.py" line="577"/> <source>Enter search text...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="284"/> + <location filename="../Preferences/ConfigurationDialog.py" line="287"/> <source>Mouse Click Handlers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="459"/> + <location filename="../Preferences/ConfigurationDialog.py" line="462"/> <source>Flash Cookie Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="497"/> + <location filename="../Preferences/ConfigurationDialog.py" line="500"/> <source>Hex Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="354"/> + <location filename="../Preferences/ConfigurationDialog.py" line="357"/> <source>Web Browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="144"/> + <source>Diff</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Connection</name> @@ -7309,6 +7314,114 @@ </message> </context> <context> + <name>DiffColoursPage</name> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/> + <source><b>Configure Diff colours</b></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/> + <source>Select the background colour for header lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/> + <source>Header Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/> + <source>Header Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/> + <source>Select the background colour for bad whitespace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/> + <source>Whitespace Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/> + <source>Select the text foreground colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/> + <source>Text Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/> + <source>Normal Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/> + <source>Select the background colour for additions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/> + <source>Added Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/> + <source>Added Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/> + <source>Select the background colour for removed text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/> + <source>Removed Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/> + <source>Removed Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/> + <source>Select the background colour for replaced text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/> + <source>Replaced Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/> + <source>Replaced Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/> + <source>Select the background colour for context lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/> + <source>Context Colour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/> + <source>Context Line</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>DiffDialog</name> <message> <location filename="../UI/DiffDialog.ui" line="14"/> @@ -7406,7 +7519,7 @@ <translation>Porovnat soubory</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="447"/> + <location filename="../UI/DiffDialog.py" line="448"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> @@ -24247,52 +24360,52 @@ <translation type="obsolete">Ty&p heslo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/> <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="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/> <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="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/> - <source><Start></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -25728,37 +25841,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/> <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/HgLogBrowserDialog.py" line="2768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> @@ -40863,27 +40976,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1552"/> + <location filename="../Preferences/__init__.py" line="1563"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1580"/> + <location filename="../Preferences/__init__.py" line="1591"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1580"/> + <location filename="../Preferences/__init__.py" line="1591"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1682"/> + <location filename="../Preferences/__init__.py" line="1693"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1682"/> + <location filename="../Preferences/__init__.py" line="1693"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -55150,7 +55263,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/> <source>Subversion Diff</source> <translation></translation> </message> @@ -55210,58 +55323,58 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/> <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="192"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/> <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/vcsSubversion/SvnDiffDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/> <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="214"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/> <source>Processing file '{0}'... </source> <translation>Spouštím proces '{0}'...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/> - <source><Start></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/> <source><End></source> <translation type="unfinished"></translation> </message>