--- a/i18n/eric5_cs.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_cs.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13749,42 +13749,42 @@ <translation>Povolit zásuvné moduly</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Procházet cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Zapnout disk cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Velikost cache:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Zadejte maximální velikost diskové cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation> MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Tisk</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Vybrat pro tisk barev pozadí a obrázků</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Tisknout barvy pozadí a obrázky</translation> </message> @@ -13844,52 +13844,52 @@ <translation>Nastavit výchozí domovskou stranu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Historie</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Odebrat položky historie:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Vybrat interval pro vypršení platnosti položek historie</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Odebrat položky historie:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Vybrat interval pro vypršení platnosti položek historie</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Po jednom dni</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Po týdnu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Po dvou týdnech</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Po měsíci</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Po roce</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Ručně</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>Při ukončení aplikace</translation> </message> @@ -13929,37 +13929,37 @@ <translation type="obsolete">Uložit hesla</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation type="unfinished"></translation> </message> @@ -13984,20 +13984,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">Jazyk:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15634,42 +15644,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15679,47 +15689,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -15734,112 +15744,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <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="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <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="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <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="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <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="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <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="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15849,65 +15859,70 @@ <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <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="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16987,6 +17002,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18931,7 +19022,7 @@ <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -18966,7 +19057,7 @@ <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -18981,7 +19072,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -19071,7 +19162,7 @@ <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19196,17 +19287,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -19241,7 +19332,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19321,7 +19412,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19341,15 +19432,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25518,42 +25629,42 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>SSL chyby</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Certifikáty</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro {0}', realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL chyby pro <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certifikáty:<br/>{0}<br/>Chcete akceptovat všechny certifikáty?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Vydatavel: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Neplatný před: {0}<br/>Platný do: {1}</translation> </message> @@ -25563,12 +25674,12 @@ <translation type="obsolete"><br/>Alternativní jména:<ul><li>{0}</li></ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -27533,27 +27644,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -49797,30 +49908,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49831,23 +49942,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49855,7 +49966,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>