--- a/i18n/eric5_cs.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_cs.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3845,7 +3845,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Spustit skript</translation> </message> @@ -3865,7 +3865,7 @@ <translation><b>Spustit skript</b><p>Nastavení parametrů příkazové řádky a spuštění skriptu bez debugeru. Pokud jsou v souboru neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Spustit projekt</translation> </message> @@ -3965,7 +3965,7 @@ <translation><b>Profilovat projekt</b><p>Nastavení parametrů příkazové řádky a spuštění projektu s profilováním kódu. Pokud jsou v projektu neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Debugovat skript</translation> </message> @@ -3985,7 +3985,7 @@ <translation><b>Debugovat skript</b><p>Nastavení parametrů příkazové řádky a aktuální řádky jako první python příkaz v aktuálním editačním okně. Pokud jsou ve skriptu neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Debugovat projekt</translation> </message> @@ -4140,7 +4140,7 @@ <translation><b>Stop</b><p>Stop běhu aktuální debug relace.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Evaluate</translation> </message> @@ -4155,7 +4155,7 @@ <translation>Vyhodnotit aktuální kontext</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Vykonat</translation> </message> @@ -4323,52 +4323,52 @@ <translation>Objevila se neošetřená výjimka. Detaily naleznete v shell okně.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Debugovaný program byl neočekávaně ukončen.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Chyba v podmíněném breakpointu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Pokrytí projektu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Pokrytí skriptu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu není definován hlavní skript. Zrušeno</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profilovat projekt</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profilovat skript</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>V aktuálním projektu není definován hlavní skript. Debugování není možné.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Zadejte příkaz pro vyhodnocení</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Zadejte příkaz pro vykonání</translation> </message> @@ -4393,12 +4393,12 @@ <translation><b>Vyhodnotit</b><p>Vyhodnotit výraz aktuálního kontextu debugovaného programu. Výsledek je zobrazen v shell okně.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Chyba sledovacího bodu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>Sledovací bod již existuje</translation> </message> @@ -4450,32 +4450,32 @@ <translation><p>Soubor <b>{0}</b> na řádce <b>{1}</b>, písmeno <b>{2}</b>, obsahuje syntaktickou chybu <b>{3}</b>.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Debugovaný program vyvolal výjimku <b>{0}</b><br>"<b>{1}</b>"<br>Soubor: <b>{2}</b>, řádek: <b>{3}</b></p><p>Zastavit zde?</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Debugovaný program vyvolal výjimku <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>Podmínka breakpointu <b>{0}, {1}</b> obsahuje syntaktickou chybu.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>Sledovací bod <b>{0}</b> obsahuje syntaktickou chybu.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Sledovací bod '<b>{0}</b>' již existuje.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Sledovací bod '<b>{0}</b>' pro proměnnou <b>{1}</b> již existuje.</p></translation> </message> @@ -15634,42 +15634,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15679,47 +15679,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="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <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="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -15734,112 +15734,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <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="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15849,60 +15849,65 @@ <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="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <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="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17266,6 +17271,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Zapsat změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Zpráva zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Zadejte zprávu pro zápis změn (commit) nebo ponechte prázdné pro použití výhozí hodnoty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Datum zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Zadejte nepovinné datum pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Autor zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Zadejte nepovinného uživatele pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -18125,17 +18228,17 @@ <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> @@ -18828,7 +18931,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="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -18863,7 +18966,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="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -18878,7 +18981,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -18968,7 +19071,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="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19093,17 +19196,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -19138,7 +19241,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19217,6 +19320,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -40170,7 +40303,7 @@ <translation>Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Žádné problémy nenalezeny.</translation> </message> @@ -45627,17 +45760,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -49649,30 +49782,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49683,23 +49816,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="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49707,7 +49840,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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>