Mercurial Repositories > eric / changeset
changeset
Mercurial: Added support for the "hg merge --abort" command as of Merc urial 4.5.
Sat, 17 Feb 2018 14:59:26 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 17 Feb 2018 14:59:26 +0100
- changeset 6154
- 11ea3d31937a
- parent 6153
- 0b18c86c03a1
- child 6155
- ae44225e7e7c
Mercurial: Added support for the "hg merge --abort" command as of Merc urial 4.5.
| Plugins/VcsPlugins/vcsMercurial/hg.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_empty.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_pt.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.ts | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Feb 16 20:18:29 2018 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Feb 17 14:59:26 2018 +0100 @@ -2147,11 +2147,15 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - args = self.initCommand("update") - args.append("--clean") + if self.version >= (4, 5, 0): + args = self.initCommand("merge") + args.append("--abort") + else: + args = self.initCommand("update") + args.append("--clean") dia = HgDialog( - self.tr('Cancelling uncommitted merge'), + self.tr('Canceling uncommitted merge'), self) res = dia.startProcess(args, repodir, False) if res:
--- a/i18n/eric6_cs.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_cs.ts Sat Feb 17 14:59:26 2018 +0100 @@ -30027,117 +30027,117 @@ <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <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="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <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="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <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="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <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="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -30147,72 +30147,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30242,7 +30242,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30267,7 +30267,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -30277,67 +30277,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -30372,15 +30367,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -42867,6 +42867,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_de.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_de.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29408,117 +29408,117 @@ <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <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="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <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="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <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="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <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="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -29528,72 +29528,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -29623,7 +29623,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -29648,7 +29648,7 @@ <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> @@ -29658,67 +29658,62 @@ <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation>Breche Zusammenführung ab</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <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="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <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="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <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="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <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="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -29753,15 +29748,20 @@ <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation>Breche Zusammenführung ab</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -41913,7 +41913,7 @@ <message> <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> <source>Select to enable JavaScript support</source> - <translation type="unfinished">Auswählen, um JavaScript zu aktivieren</translation> + <translation>Auswählen, um JavaScript zu aktivieren</translation> </message> </context> <context>
--- a/i18n/eric6_empty.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_empty.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29296,7 +29296,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -29321,270 +29321,270 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -41674,6 +41674,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_en.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_en.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29255,117 +29255,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the 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="2242"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -29375,72 +29375,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -29470,7 +29470,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -29495,7 +29495,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -29505,67 +29505,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -29600,15 +29595,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -41716,6 +41716,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_es.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_es.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29449,117 +29449,117 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <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="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <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="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <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="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <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="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <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="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <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> @@ -29569,72 +29569,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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> @@ -29664,7 +29664,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -29689,7 +29689,7 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> @@ -29701,65 +29701,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Cancelling uncommitted merge</source> - <translation>Cancelando merge sin commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <translation type="obsolete">Cancelando merge sin commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <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="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <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="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <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="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <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="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -29794,15 +29794,20 @@ <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -41957,6 +41962,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished">Permitir acceso al portapapeles</translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_fr.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_fr.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29940,117 +29940,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -30060,72 +30060,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30155,7 +30155,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30180,7 +30180,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -30190,67 +30190,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <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="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <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="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <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="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <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="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -30285,15 +30280,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -42621,6 +42621,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_it.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_it.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29399,117 +29399,117 @@ <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <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="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <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="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <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="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <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="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -29519,72 +29519,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -29614,7 +29614,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -29639,7 +29639,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -29649,67 +29649,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <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="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <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="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <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="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <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="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -29744,15 +29739,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -41882,6 +41882,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_pt.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_pt.ts Sat Feb 17 14:59:26 2018 +0100 @@ -30231,117 +30231,117 @@ <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -30351,72 +30351,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30446,7 +30446,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30506,85 +30506,85 @@ <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -43310,6 +43310,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_ru.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_ru.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29503,117 +29503,117 @@ <translation>Mercurial: Передача (проталкивание) изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветви в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неверная Bisect подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> @@ -29623,72 +29623,72 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -29718,7 +29718,7 @@ <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> @@ -29743,7 +29743,7 @@ <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> @@ -29755,65 +29755,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Cancelling uncommitted merge</source> - <translation>Отмена незавершённого слияния</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <translation type="obsolete">Отмена незавершённого слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation>Загрузить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для загрузки:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</translation> </message> @@ -29848,15 +29848,20 @@ <translation>Пометить как 'разрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные bundles-пакеты, сохраненные в области резервного копирования <b>{0}</b>?</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -42028,6 +42033,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished">Разрешить доступ к буферу</translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_tr.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_tr.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29978,117 +29978,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the 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="2242"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <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="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -30098,72 +30098,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30193,7 +30193,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30218,7 +30218,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -30228,67 +30228,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -30323,15 +30318,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -42706,6 +42706,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
--- a/i18n/eric6_zh_CN.ts Fri Feb 16 20:18:29 2018 +0100 +++ b/i18n/eric6_zh_CN.ts Sat Feb 17 14:59:26 2018 +0100 @@ -29974,117 +29974,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/> <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="2842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -30094,72 +30094,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/> <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="3497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/> <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="2910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30189,7 +30189,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30214,7 +30214,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -30224,67 +30224,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> - <source>Cancelling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -30319,15 +30314,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <source>Canceling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -42699,6 +42699,11 @@ <source>Allow to access the clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/> + <source>Select to enable JavaScript support</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Largefiles</name>
