--- a/i18n/eric6_cs.ts Wed Nov 16 20:03:45 2016 +0100 +++ b/i18n/eric6_cs.ts Thu Nov 17 18:59:13 2016 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation>Přidat záložku</translation> </message> @@ -1777,7 +1777,7 @@ <translation>Editovat &adresu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation>&Smazat</translation> </message> @@ -2470,12 +2470,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation type="unfinished"></translation> </message> @@ -2641,7 +2641,7 @@ <translation>Stisknutím zrušit sdílený editor</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation>Vyčistit</translation> </message> @@ -2939,7 +2939,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> @@ -4880,7 +4880,7 @@ <translation type="unfinished">Doména:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7646,7 +7646,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> @@ -8116,92 +8116,92 @@ <translation type="unfinished">Standardní tlačítka</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation type="unfinished">Přerušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation type="unfinished">Použít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation type="unfinished">Zrušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation type="unfinished">Zavřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation type="unfinished">Zahodit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation type="unfinished">Ignorovat</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation type="unfinished">Ne</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation type="unfinished">Ne pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation type="unfinished">Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation type="unfinished">Otevřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation type="unfinished">Obnovit defaulty</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation type="unfinished">Vrátit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation type="unfinished">Uložit vše</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation type="unfinished">Ano</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation type="unfinished">Ano pro všechno</translation> </message> @@ -10211,7 +10211,7 @@ <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/> <source>Add from installed APIs</source> <translation>Přidat z instalovaných API</translation> </message> @@ -10221,7 +10221,7 @@ <translation>Stiskněte pro kompilování vybrané API definici</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> <source>Compile APIs</source> <translation>Kompilovat API</translation> </message> @@ -10286,7 +10286,7 @@ <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/> <source>Add from Plugin APIs</source> <translation>Přidat z API pluginů</translation> </message> @@ -11300,7 +11300,7 @@ <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> </message> @@ -11345,7 +11345,7 @@ <translation>Vybrat font.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation></translation> </message> @@ -12796,7 +12796,7 @@ <translation>Mód:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation>Vypnuto</translation> </message> @@ -13580,7 +13580,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="339"/> <source>Send bug report</source> <translation>Odeslat hlášení o chybách</translation> </message> @@ -15025,12 +15025,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation type="unfinished"></translation> </message> @@ -15045,7 +15045,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation type="unfinished"></translation> </message> @@ -16189,7 +16189,7 @@ <translation type="unfinished">Jméno:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16199,7 +16199,7 @@ <translation type="unfinished">Velikost:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> @@ -16234,7 +16234,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> @@ -16660,7 +16660,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation type="unfinished"></translation> </message> @@ -21924,7 +21924,7 @@ <translation type="obsolete">hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -21959,242 +21959,242 @@ <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="640"/> <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="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> <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="751"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <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="813"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="822"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1088"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1390"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1610"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> <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="2264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/> <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="2437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2461"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> <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="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <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="2293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2776"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> <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="2799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <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="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708"/> <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="2853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> <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="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/> <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="2880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="553"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3399"/> <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="3535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <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="2948"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3104"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3130"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3301"/> <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="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> <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="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320"/> <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="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22209,157 +22209,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1037"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> - <source>Do you really want to revert all changes to these files or directories?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/> + <source>Do you really want to revert all changes to these files or directories?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1037"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="987"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1164"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3696"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3729"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3866"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3866"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3878"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3910"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3910"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3922"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1134"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> - <source>Re-Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1134"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1139"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3182"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3182"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22367,7 +22367,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> @@ -23478,6 +23478,41 @@ <source>Commit sub-repositories</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="80"/> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="86"/> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="96"/> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="109"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="112"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="137"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="144"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgConflictsListDialog</name> @@ -23507,7 +23542,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -23517,7 +23552,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -24141,7 +24176,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> @@ -24513,7 +24548,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -24654,7 +24689,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -24684,17 +24719,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -28641,7 +28676,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Status</source> <translation>Mercurial status</translation> </message> @@ -28782,7 +28817,7 @@ <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> @@ -28902,7 +28937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -30172,7 +30207,7 @@ <translation>Stisknout pro odebrání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation>Odeb&rat</translation> </message> @@ -35793,109 +35828,109 @@ <translation>Zadejte počet zpráv zapsaných změn k zapamatování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> <source>Incoming / Outgoing</source> <translation>Příchozí / Odchozí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> <source>Select to show the incoming and outgoing log in a log browser dialog</source> <translation>Vybrat pro zobrazení příchozích a odchozích logů v prohlížeči logů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> <source>Use Log Browser for incoming / outgoing log</source> <translation>Použít Log prohlížeč pro příchozí / odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> <source>Pull</source> <translation>Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> <source>Select to update the working directory to new tip</source> <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> <source>Update after pulling</source> <translation>Aktualizovat po stažení</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <source>Select to prefer unbundle over pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <source><b>Prefer Unbundle</b> +<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <source>Prefer Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <source>Revert</source> + <translation type="unfinished">Vrátit</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> - <source>Edit the Mercurial configuration file</source> + <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> - <source>Edit configuration file</source> - <translation type="unfinished"></translation> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> - <source>Cleanup</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="280"/> - <source>Pattern:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="287"/> - <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="215"/> - <source>Select to prefer unbundle over pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> - <source><b>Prefer Unbundle</b> -<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Prefer Unbundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> - <source>Revert</source> - <translation type="unfinished">Vrátit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/> - <source>Select to create a backup file (.orig) before reverting changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/> - <source>Create Backup Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="232"/> - <source>Merge</source> - <translation type="unfinished">Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="238"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35929,6 +35964,16 @@ <source>Consider hidden changesets</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <source>No. of commit authors to remember:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <source>Enter the number of commit authors to remember</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36051,92 +36096,92 @@ <translation>Standardní tlačítka</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation>Použít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation>Přerušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation>Ignorovat</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation>Uložit vše</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation>Zahodit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation>Ano pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation>Ne</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation>Ne pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation>Vrátit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation>Obnovit defaulty</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation>Ano</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation>Zavřít</translation> </message> @@ -37886,7 +37931,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation type="unfinished"></translation> </message> @@ -37994,7 +38039,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation type="unfinished"></translation> </message> @@ -38665,7 +38710,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation>Uložená hesla</translation> </message> @@ -43488,7 +43533,7 @@ <translation>Vykonáno</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation>Pokrytí</translation> </message> @@ -43569,7 +43614,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -43577,7 +43622,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation>Výsledky profilování</translation> </message> @@ -48218,7 +48263,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation type="unfinished"></translation> </message> @@ -48228,7 +48273,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation type="unfinished"></translation> </message> @@ -49696,7 +49741,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -50898,7 +50943,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation type="unfinished"></translation> </message> @@ -53518,7 +53563,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation></translation> </message> @@ -53795,12 +53840,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> <source>Author</source> <translation>Autor</translation> </message> @@ -53810,7 +53855,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -54282,7 +54327,7 @@ <translation>Prot&otokol:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54394,7 +54439,7 @@ <translation>Výběr protokolu pro přístup do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55638,7 +55683,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> <source>Subversion Status</source> <translation></translation> </message> @@ -55885,7 +55930,7 @@ <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> <source>Commit</source> <translation>Commit</translation> </message> @@ -61195,7 +61240,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="14"/> + <location filename="../PyUnit/UnittestDialog.py" line="400"/> <source>Unittest</source> <translation></translation> </message> @@ -72014,46 +72059,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <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="2140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <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="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> <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="2122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> <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="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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="2145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> <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> @@ -72061,12 +72106,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1515"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72077,13 +72122,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>