Mercurial Repositories > eric / changeset
changeset
Changed the display strings for Qt projects and updated translations.
Sat, 05 Jul 2014 18:38:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 05 Jul 2014 18:38:10 +0200
- changeset 3688
- 1b5dae8f0173
- parent 3687
- 68952a98e7b2
- child 3691
- c473d6347610
Changed the display strings for Qt projects and updated translations.
| Project/Project.py | file | annotate | diff | comparison | revisions | |
| i18n/eric6_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_en.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/Project/Project.py Sat Jul 05 18:33:48 2014 +0200 +++ b/Project/Project.py Sat Jul 05 18:38:10 2014 +0200 @@ -241,8 +241,8 @@ self.__lexerAssociationCallbacks = {} self.__binaryTranslationsCallbacks = {} - self.__projectTypes["Qt4"] = self.tr("Qt GUI") - self.__projectTypes["Qt4C"] = self.tr("Qt Console") + self.__projectTypes["Qt4"] = self.tr("PyQt4 GUI") + self.__projectTypes["Qt4C"] = self.tr("PyQt4 Console") self.__projectTypes["PyQt5"] = self.tr("PyQt5 GUI") self.__projectTypes["PyQt5C"] = self.tr("PyQt5 Console") self.__projectTypes["E4Plugin"] = self.tr("Eric Plugin")
--- a/i18n/eric6_cs.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_cs.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7687,47 +7687,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished">Kritický</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished">Závažná chyba</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -15313,7 +15313,7 @@ <translation>Hledat</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Výběr adresáře</translation> </message> @@ -15373,7 +15373,7 @@ <translation>Nahradit</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Nahradit v souborech</translation> </message> @@ -15398,37 +15398,37 @@ <translation>Pocit jako</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Kopírovat cestu do schránky</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Neplatný výraz hledání</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Výraz hledná není platný. </p><p>Chyba: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze číst ze souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -15438,13 +15438,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -15453,7 +15453,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -19817,7 +19817,7 @@ <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -19892,12 +19892,12 @@ <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -19912,12 +19912,12 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <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="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> @@ -19937,87 +19937,87 @@ <translation type="obsolete">Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <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="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <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="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <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="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <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="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <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="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <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="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -20027,7 +20027,7 @@ <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="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> @@ -20037,27 +20037,27 @@ <translation type="obsolete">Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <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="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20067,72 +20067,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20162,22 +20162,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <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> @@ -20187,7 +20187,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20197,67 +20197,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20282,12 +20282,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -35894,27 +35894,27 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Uložit login data</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Nahrávání login dat</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>Chcete uložit toto heslo?</b><br/>Pro kontrolu uložených a odebraných hesel použijte dialog správce hesel v menu nastavení.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Nikdy pro tento web</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Nikdy pro tento web</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Teď ne</translation> </message> @@ -35924,43 +35924,43 @@ <translation type="obsolete"><p>Login data nelze uložit do <b>{0}</b></p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Login data nelze z <b>{0}</b> nahrát</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>Login data nelze z <b>{0}</b> nahrát</p><p>Důvod: Chybný vstupní formát</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -38886,16 +38886,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="246"/> <source>PyQt5 GUI</source> <translation type="unfinished"></translation> @@ -38955,6 +38945,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p> {6 ?} {0}?}</translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -46580,27 +46580,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation>Nahrazeno {0} výskytů.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Nebylo nic nahrazeno, protože '{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Najít další</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Najít předchozí</translation> </message> @@ -46723,7 +46723,7 @@ <translation>Jen výběr</translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>Výraz nebyl nalezen.</translation> </message> @@ -46733,7 +46733,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -58560,7 +58560,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -66707,23 +66707,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <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="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -66741,23 +66741,23 @@ <translation type="obsolete"><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="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <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="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <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="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -66765,12 +66765,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="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <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="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_de.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_de.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7199,47 +7199,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation>Debug Nachricht:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation>Kritischer Fehler:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation>Fataler Fehler:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation>Kritischer Fehler</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation>Fataler Fehler</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation>Debug Nachricht</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation>Es ist kein Nachrichtenhandler installiert.</translation> </message> @@ -14549,7 +14549,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Wähle ein Verzeichnis</translation> </message> @@ -14739,17 +14739,17 @@ <translation>Ersetzen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Ersetzen in Dateien</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> @@ -14774,27 +14774,27 @@ <translation>Ersttreffer öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Ungültiger Suchausdruck</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Der Suchausdruck ist nicht gültig.</p><p>Fehler: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Der aktuelle und der originale Hash-Wert der Datei <b>{0}</b> sind unterschiedlich. Überspringe sie.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -14804,13 +14804,13 @@ <translation>%v/%m Dateien</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation>{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation> <numerusform>%n Vorkommen</numerusform> @@ -14818,7 +14818,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation> <numerusform>%n Datei</numerusform> @@ -18994,7 +18994,7 @@ <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -19059,137 +19059,137 @@ <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19199,72 +19199,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19294,22 +19294,22 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -19319,7 +19319,7 @@ <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> @@ -19329,67 +19329,67 @@ <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -19414,12 +19414,12 @@ <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> @@ -34136,69 +34136,69 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Anmeldedaten speichern</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Anmeldedaten laden</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Die Anmeldedaten konnten nicht aus der Datei <b>{0}</b> geladen werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>Die Anmeldedaten konnten nicht aus der Datei <b>{0}</b> geladen werden.</p><p>Ursache: Falsches Format</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>Wollen Sie das Kennwort speichern?</b><br/>Um die gespeicherten Kennworte anzusehen und zu löschen, verwenden Sie den Kennwortmanagement-Dialog aus dem Einstellungsmenü.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Niemals für diese Site</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Niemals für diese Site</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Jetzt nicht</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation>Kennwort speichern</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation>Kodiere gespeicherte Kennworte neu...</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation><p>Die Anmeldedaten konnten nicht in die Datei <b>{0}</b> gespeichert werden.</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation>Fehler beim Laden der Anmeldedaten in Zeile {0}, Spalte {1}: {2}</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation>%v/%m Kennworte</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation>Kennworte</translation> </message> @@ -36859,12 +36859,12 @@ <message> <location filename="../Project/Project.py" line="244"/> <source>Qt GUI</source> - <translation>Qt Oberfläche</translation> + <translation type="obsolete">Qt Oberfläche</translation> </message> <message> <location filename="../Project/Project.py" line="245"/> <source>Qt Console</source> - <translation>Qt Kommandozeile</translation> + <translation type="obsolete">Qt Kommandozeile</translation> </message> <message> <location filename="../Project/Project.py" line="246"/> @@ -36926,6 +36926,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Die eric6 Plugin Archivdatei <b>{0}</b> wurde erfolgreich erzeugt.</p></translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation>PyQt4 Oberfläche</translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation>PyQt4 Kommandozeile</translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -44264,27 +44274,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation>{0} Vorkommen ersetzt.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Es wurde nichts ersetzt, da „{0}“ nicht gefunden wurde.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Weitersuchen</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Rückwärtssuchen</translation> </message> @@ -44444,7 +44454,7 @@ <translation>nur Auswahl</translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>Ausdruck nicht gefunden.</translation> </message> @@ -44454,7 +44464,7 @@ <translation>Alle hervorheben</translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> @@ -55721,7 +55731,12 @@ <message> <location filename="../Graphics/UMLDialog.py" line="280"/> <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> - <translation>Eric6-Grafikdateien (*.e5g);;Alle Dateien (*)</translation> + <translation type="obsolete">Eric6-Grafikdateien (*.e5g);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Graphics/UMLDialog.py" line="280"/> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> + <translation>Eric-Grafikdateien (*.e5g);;Alle Dateien (*)</translation> </message> </context> <context> @@ -63151,24 +63166,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -63177,24 +63192,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -63205,12 +63220,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_en.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_en.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7103,47 +7103,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -14575,47 +14575,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -14625,13 +14625,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation> <numerusform>%n occurrence</numerusform> @@ -14639,7 +14639,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation> <numerusform>%n file</numerusform> @@ -18752,7 +18752,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -18817,137 +18817,137 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <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="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18957,72 +18957,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19052,22 +19052,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -19077,7 +19077,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -19087,67 +19087,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -19172,12 +19172,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -33788,68 +33788,68 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -36463,16 +36463,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="246"/> <source>PyQt5 GUI</source> <translation type="unfinished"></translation> @@ -36532,6 +36522,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -43678,27 +43678,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -43826,12 +43826,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -54916,7 +54916,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -62201,46 +62201,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -62248,12 +62248,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <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="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_es.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_es.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7194,47 +7194,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation>Mensaje de Depuración:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation>Advertencia:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation>Aviso Crítico:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation>Error Fatal:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation>Aviso Crítico</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation>Error Fatal</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation>Mensaje de Depuración</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation>No hay gestor de mensajes instalado.</translation> </message> @@ -14678,7 +14678,7 @@ <translation>Buscar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Seleccionar un directorio</translation> </message> @@ -14748,7 +14748,7 @@ <translation>Reemplazar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Reemplazar en Archivos</translation> </message> @@ -14763,37 +14763,37 @@ <translation>Abrir primera ocurrencia</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Expresión de búsqueda no válida</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>La expresión de búsqueda no es válida.</p><p>Error:{0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo leer el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Los hash actual y original del archivos <b>{0}</b> son distintos. Abandonando.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -14803,13 +14803,13 @@ <translation>%v/%m Archivos</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation>{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation> <numerusform>%n ocurrencia</numerusform> @@ -14817,7 +14817,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation> <numerusform>%n archivo</numerusform> @@ -18993,7 +18993,7 @@ <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> @@ -19053,17 +19053,17 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> @@ -19073,122 +19073,122 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -19198,72 +19198,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -19293,22 +19293,22 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -19318,7 +19318,7 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> @@ -19328,67 +19328,67 @@ <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -19413,12 +19413,12 @@ <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> @@ -34137,69 +34137,69 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Guardar datos de login</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Cargando datos de login</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>¿Le gustaría almacenar esta contraseña?</b><br/>Para revisar las contraselas que tiene almacenadas y eliminarlas, utilice el diálogo de gestión de contraseñas del menú de Configuración.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Nunca para este sitio</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Nunca para este sitio</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Ahora no</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Los datos de login no se han podido cargar desde <b>{0}</b></p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>Los datos de login no se han podido cargar desde <b>{0}</b></p><p>Razón: Formato erróneo de input</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation>Almacenar contraseña</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation>Recodificando contraseñas almacenadas...</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation><p>Los datos de login no se han podido guardar en <b>{0}</b></p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation>Error al cargar datos de login en línea {0}, columna {1}: {2}</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation>%v/%m Contraseñas</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation>Contraseñas</translation> </message> @@ -36859,12 +36859,12 @@ <message> <location filename="../Project/Project.py" line="244"/> <source>Qt GUI</source> - <translation>Qt GUI</translation> + <translation type="obsolete">Qt GUI</translation> </message> <message> <location filename="../Project/Project.py" line="245"/> <source>Qt Console</source> - <translation>Consola Qt</translation> + <translation type="obsolete">Consola Qt</translation> </message> <message> <location filename="../Project/Project.py" line="246"/> @@ -36926,6 +36926,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"><p>El archivo de plugin de eric5 <b>{0}</b> se ha creado satisfactoriamente.</p> {6 ?} {0}?}</translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished">GUI PyQt5 {4 ?}</translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished">Consola PyQt5 {4 ?}</translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -44227,27 +44237,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation>Se han reemplazado {0} ocurrencias.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>No se ha reemplazado nada porque '{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Buscar Siguiente</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Buscar Anterior</translation> </message> @@ -44411,7 +44421,7 @@ <translation>Selección solamente</translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>La expresión no se ha encontrado.</translation> </message> @@ -44421,7 +44431,7 @@ <translation>Resaltar todo</translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> @@ -55670,7 +55680,12 @@ <message> <location filename="../Graphics/UMLDialog.py" line="280"/> <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> - <translation type="unfinished">Archivo de Gráficos Eric5 (*.e5g);;Todos los Archivos (*) {6 ?} {5g?}</translation> + <translation type="obsolete">Archivo de Gráficos Eric5 (*.e5g);;Todos los Archivos (*) {6 ?} {5g?}</translation> + </message> + <message> + <location filename="../Graphics/UMLDialog.py" line="280"/> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -63095,17 +63110,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -63116,31 +63131,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -63149,12 +63164,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_fr.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_fr.ts Sat Jul 05 18:38:10 2014 +0200 @@ -8426,47 +8426,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished">Critique</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished">Erreur critique</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -16192,7 +16192,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Sélection répertoire</translation> </message> @@ -16397,7 +16397,7 @@ <translation>Remplacer</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Remplacer dans les fichiers</translation> </message> @@ -16422,37 +16422,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation type="unfinished">Ouvrir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copier chemin dans le Presse-Papiers</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -16462,13 +16462,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -16476,7 +16476,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -21022,7 +21022,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21087,12 +21087,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -21102,127 +21102,127 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21232,72 +21232,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21327,22 +21327,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -21352,7 +21352,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -21362,67 +21362,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -21447,12 +21447,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -37158,68 +37158,68 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -40589,16 +40589,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="334"/> <source><p>The Project type <b>{0}</b> is already registered with Programming Language <b>{1}</b>.</p></source> <translation type="unfinished"></translation> @@ -40663,6 +40653,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -48966,27 +48966,27 @@ <translation type="obsolete">Aucun remplacement car '%1' est introuvable.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation type="unfinished">Suivant</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation type="unfinished">Précédent</translation> </message> @@ -49109,7 +49109,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation type="unfinished"></translation> </message> @@ -49119,7 +49119,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -60843,7 +60843,8 @@ <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>&Translation Path Pattern: (Use '%language%' where the language code should be inserted, e.g. i18n/eric6_%language%.ts)</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Pattern des fichiers de traduction: +(Utiliser la balise %language% là où la langue doit être insérée, ex: i18n/eric4_%language%.ts) {18n?} {5_?} {18n?} {6_?}</translation> </message> </context> <context> @@ -61687,7 +61688,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -70375,24 +70376,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -70418,23 +70419,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -70445,12 +70446,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_it.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_it.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7845,47 +7845,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation>Messaggio del debug:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation>Attenzione:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation>Critico:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation>Errore fatale:</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation>Critico</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation>Errore fatale</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation>Messaggio del debug</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation>Gestore dei messaggi non installato.</translation> </message> @@ -15414,7 +15414,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Seleziona una directory</translation> </message> @@ -15619,7 +15619,7 @@ <translation>Sostituisci</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Sostituisci nei file</translation> </message> @@ -15634,37 +15634,37 @@ <translation>Feeling Like</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Copia il path nella Clipboard</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Espressione di ricerca non valida</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>L'espressione di ricerca non è valida.</p><p>Errore: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso leggere il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>L'hash originale e quello corrente del file <b>{0}</b> sono differenti. Lo salto.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -15674,13 +15674,13 @@ <translation>%v/%m Files</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -15688,7 +15688,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -20041,7 +20041,7 @@ <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> @@ -20116,12 +20116,12 @@ <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -20136,12 +20136,12 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> @@ -20161,92 +20161,92 @@ <translation type="obsolete">Inserisci il nome del Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> @@ -20256,27 +20256,27 @@ <translation type="obsolete">Identifica i file changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20286,72 +20286,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20381,22 +20381,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -20406,7 +20406,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20416,67 +20416,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -20501,12 +20501,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -36005,27 +36005,27 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Salvataggio dati di login</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Caricamento dati di login</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>Vuoi salvare questa password ?</b><br/>Per rivedere le password che hai salvato e rimuoverle, usa il dialogo di gestione delle password del menù Impostazioni.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Mai per questo sito</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Mai per questo sito</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Non adesso</translation> </message> @@ -36035,43 +36035,43 @@ <translation type="obsolete"><p>I dati di login non possono essere salvati su <b>{0}</b></p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>I dati di login non possono essere caricati da <b>{0}</b></p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>I dati di login non possono essere caricati da <b>{0}</b></p><p>Motivo: formato in ingresso errato</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation>Salva password</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -39280,16 +39280,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="246"/> <source>PyQt5 GUI</source> <translation type="unfinished"></translation> @@ -39349,6 +39339,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"><p>Il file archivio del plugin di eric5<b>{0} </b> è stato creato con successo.</p> {6 ?} {0}?}</translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -47048,27 +47048,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation>Sostituite {0} ricorrenze.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Nessuna sostituzione perché '{0}' non è stato trovato.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Trova successivo</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Trova prec</translation> </message> @@ -47191,7 +47191,7 @@ <translation>Solo selezione</translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>Espressione non trovata.</translation> </message> @@ -47201,7 +47201,7 @@ <translation>Evidenzia tutti</translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> @@ -58671,7 +58671,8 @@ <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>&Translation Path Pattern: (Use '%language%' where the language code should be inserted, e.g. i18n/eric6_%language%.ts)</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Percorso pattern &Traduzione: +(Usa '%language%' dove il codice della lingua deve essere usato, e.g. i18n/eric5_%language%.ts) {18n?} {6_?}</translation> </message> </context> <context> @@ -59470,7 +59471,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -67608,24 +67609,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -67651,24 +67652,24 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -67678,12 +67679,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_ru.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_ru.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7889,47 +7889,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished">Предупреждение</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished">Ошибка</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -15516,7 +15516,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -15711,17 +15711,17 @@ <translation>Заменить</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> @@ -15746,27 +15746,27 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Неверное выражение для поиска</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation> </message> @@ -15776,13 +15776,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -15791,7 +15791,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -20142,7 +20142,7 @@ <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> @@ -20207,7 +20207,7 @@ <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -20222,12 +20222,12 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> @@ -20247,7 +20247,7 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> @@ -20262,92 +20262,92 @@ <translation type="obsolete">Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> @@ -20357,27 +20357,27 @@ <translation type="obsolete">Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20387,72 +20387,72 @@ <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20482,22 +20482,22 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -20507,7 +20507,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20517,67 +20517,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation>Mercurial закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку, которая будет удалена:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation>Удалить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation>Переименовать Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation>Переместить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation>Тянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку, для перетаскивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку, для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -20602,12 +20602,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -36116,7 +36116,7 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Сохранение данных учётной записи</translation> </message> @@ -36126,63 +36126,63 @@ <translation type="obsolete"><p>Невозможно сохранить учётные данные <b>{0}</b></p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Загрузка данных учётной записи</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Невозможно загрузить учётные данные из <b>{0}</b></p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>Невозможно загрузить учётные данные из <b>{0}</b></p><p>Причина: Неправильный формат</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>Сохранить этот пароль?</b><br/>Для изменения сохранённых паролей используйте диалог управления паролями из меню настроек.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Никогда для этого сайта</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Никогда для этого сайта</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Не сейчас</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation>Сохранить пароль</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -39437,12 +39437,12 @@ <message> <location filename="../Project/Project.py" line="244"/> <source>Qt GUI</source> - <translation>Qt GUI</translation> + <translation type="obsolete">Qt GUI</translation> </message> <message> <location filename="../Project/Project.py" line="245"/> <source>Qt Console</source> - <translation>Qt Консоль</translation> + <translation type="obsolete">Qt Консоль</translation> </message> <message> <location filename="../Project/Project.py" line="246"/> @@ -39504,6 +39504,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p> {6 ?} {0}?}</translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -47124,27 +47134,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation>Заменено в {0} местах.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Ничего не заменено, потому что '{0}' не найдено.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Найти далее</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Найти предыдущее</translation> </message> @@ -47267,7 +47277,7 @@ <translation></translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>Выражение не найдено.</translation> </message> @@ -47277,7 +47287,7 @@ <translation>Подсвечивать всё</translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' не найдено.</translation> </message> @@ -59508,7 +59518,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -67725,17 +67735,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -67746,30 +67756,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -67796,12 +67806,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_tr.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_tr.ts Sat Jul 05 18:38:10 2014 +0200 @@ -7690,47 +7690,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished">Kritik</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished">Ölümcül Hata</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -15395,47 +15395,47 @@ <translation>Bul</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>Dosyalarda yer değiştir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation>Geçersiz arama ifadesi</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>Dizin Seçiniz</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation>Yolu Panoya kopyala</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -15445,13 +15445,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -15459,7 +15459,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -19806,7 +19806,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -19871,12 +19871,12 @@ <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -19891,12 +19891,12 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -19911,117 +19911,117 @@ <translation type="obsolete">Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20031,72 +20031,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20126,22 +20126,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -20151,7 +20151,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20161,67 +20161,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20246,12 +20246,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -35648,7 +35648,7 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation>Günlük verilerini sakla</translation> </message> @@ -35658,63 +35658,63 @@ <translation type="obsolete"><p>Günlük verisi <b>{0}</b>ne kaydedilemedi</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation>Günlük verileri yükleniyor</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Giriş verisi <b>{0}</b> den okunamıyor</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation><p>Giriş verisi <b>{0}</b> den okunamıyor</p><p>Sebep: Hatalı giriş formatı</p></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation><b>Parolayı kaydetmeyi tercih eder misiniz?</b><br/>Kaydettiğiniz yada kaldırdığınız parolaları tekrar gözden geçirmek için, ayarlar meüsünden parola yönetimi diyaloğunu kullanabilirsiniz.</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation>Bu site için hiçbir zaman</translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation>Bu site için hiçbir zaman</translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation>Şimdi değil</translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -38578,16 +38578,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="246"/> <source>PyQt5 GUI</source> <translation type="unfinished"></translation> @@ -38647,6 +38637,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -46038,27 +46038,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation>Sonrakini Bul</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation>Öncekini Bul</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation>'{0}' bulunamadı.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -46181,7 +46181,7 @@ <translation>YAlnızca seçilen</translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation>İfade Bulunmadı.</translation> </message> @@ -46191,7 +46191,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> @@ -57942,7 +57942,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -65928,24 +65928,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <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>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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> @@ -65971,23 +65971,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -65998,12 +65998,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <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="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric6_zh_CN.GB2312.ts Sat Jul 05 18:33:48 2014 +0200 +++ b/i18n/eric6_zh_CN.GB2312.ts Sat Jul 05 18:38:10 2014 +0200 @@ -8150,47 +8150,47 @@ <context> <name>E5ErrorMessage</name> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="100"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="101"/> <source>Debug Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="103"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="104"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="106"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="107"/> <source>Critical:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="109"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="110"/> <source>Fatal Error:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="139"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="140"/> <source>Warning</source> <translation type="unfinished">警告</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="142"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="143"/> <source>Critical</source> <translation type="unfinished">危险</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="145"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="146"/> <source>Fatal Error</source> <translation type="unfinished">严重错误</translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="136"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="137"/> <source>Debug Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5ErrorMessage.py" line="177"/> + <location filename="../E5Gui/E5ErrorMessage.py" line="178"/> <source>No message handler installed.</source> <translation type="unfinished"></translation> </message> @@ -16084,12 +16084,12 @@ <translation>查找</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source>Replace in Files</source> <translation>在文件中替换</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="550"/> + <location filename="../UI/FindFileDialog.py" line="553"/> <source>Select directory</source> <translation>选择文件夹</translation> </message> @@ -16114,37 +16114,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="688"/> + <location filename="../UI/FindFileDialog.py" line="691"/> <source>Open</source> <translation type="unfinished">打开</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="689"/> + <location filename="../UI/FindFileDialog.py" line="692"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="376"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="620"/> + <location filename="../UI/FindFileDialog.py" line="623"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="661"/> + <location filename="../UI/FindFileDialog.py" line="664"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="635"/> + <location filename="../UI/FindFileDialog.py" line="638"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -16154,20 +16154,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="494"/> + <location filename="../UI/FindFileDialog.py" line="497"/> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileDialog.py" line="495"/> + <location filename="../UI/FindFileDialog.py" line="498"/> <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -20725,7 +20725,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -20790,12 +20790,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -20805,127 +20805,127 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20935,72 +20935,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/> <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="3507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/> <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="2926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21030,22 +21030,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -21055,7 +21055,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -21065,67 +21065,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -21150,12 +21150,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -36856,68 +36856,68 @@ <context> <name>PasswordManager</name> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source>Saving login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source>Loading login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/> - <source>Never for this site</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/> + <source>Never for this site</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/> <source>Not now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/> <source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/> <source>Save password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/> <source><p>Login data could not be saved to <b>{0}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/> <source>Error when loading login data on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/> <source>%v/%m Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/> + <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/> <source>Passwords</source> <translation type="unfinished"></translation> </message> @@ -40296,16 +40296,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="244"/> - <source>Qt GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>Qt Console</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="246"/> <source>PyQt5 GUI</source> <translation type="unfinished"></translation> @@ -40365,6 +40355,16 @@ <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Project/Project.py" line="244"/> + <source>PyQt4 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="245"/> + <source>PyQt4 Console</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectBaseBrowser</name> @@ -48680,27 +48680,27 @@ <translation type="obsolete">没有替换任何东西，因为“%1”未找到。</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/> <source>Replaced {0} occurrences.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/> <source>Nothing replaced because '{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/> <source>Find Next</source> <translation type="unfinished">查找下一个</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Prev</source> <translation type="unfinished">查找上一个</translation> </message> @@ -48823,7 +48823,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/SearchWidget.py" line="97"/> + <location filename="../Helpviewer/SearchWidget.py" line="98"/> <source>Expression was not found.</source> <translation type="unfinished"></translation> </message> @@ -48833,7 +48833,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="182"/> + <location filename="../UI/SearchWidget.py" line="183"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -60549,7 +60549,8 @@ <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>&Translation Path Pattern: (Use '%language%' where the language code should be inserted, e.g. i18n/eric6_%language%.ts)</source> - <translation type="unfinished"></translation> + <translation type="unfinished">翻译路径模式(&T)： +（在要插入语言代码的地方使用“%language%”，如：i18n/eric4_%language%.ts） {18n?} {5_?} {18n?} {6_?}</translation> </message> </context> <context> @@ -61393,7 +61394,7 @@ </message> <message> <location filename="../Graphics/UMLDialog.py" line="280"/> - <source>Eric6 Graphics File (*.e5g);;All Files (*)</source> + <source>Eric Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> </context> @@ -70029,46 +70030,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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> @@ -70076,12 +70077,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <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="1492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
