Tue, 07 Feb 2012 19:27:53 +0100
Added support for Phases as of Mercurial 2.1.
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Feb 06 19:59:32 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Feb 07 19:27:53 2012 +0100 @@ -38,10 +38,11 @@ IconColumn = 0 BranchColumn = 1 RevisionColumn = 2 - AuthorColumn = 3 - DateColumn = 4 - MessageColumn = 5 - TagsColumn = 6 + PhaseColumn = 3 + AuthorColumn = 4 + DateColumn = 5 + MessageColumn = 6 + TagsColumn = 7 def __init__(self, vcs, mode="log", bundle=None, parent=None): """ @@ -130,6 +131,8 @@ if self.vcs.version >= (1, 8): self.logTree.headerItem().setText(self.logTree.columnCount(), self.trUtf8("Bookmarks")) + if self.vcs.version < (2, 1): + self.logTree.setColumnHidden(self.PhaseColumn, True) def __initData(self): """ @@ -505,7 +508,7 @@ parts[-2].split(":", 1)[0]) def __generateLogItem(self, author, date, message, revision, changedPaths, - parents, branches, tags, bookmarks=None): + parents, branches, tags, phase, bookmarks=None): """ Private method to generate a log tree entry. @@ -537,6 +540,7 @@ "", branches[0] + closedStr, "{0:>7}:{1}".format(rev, node), + phase, author, date, msgtxt, @@ -637,7 +641,10 @@ if self.commandMode == "log": args.append('--copies') args.append('--style') - if self.vcs.version >= (1, 8): + if self.vcs.version >= (2, 1): + args.append(os.path.join(os.path.dirname(__file__), + "styles", "logBrowserBookmarkPhase.style")) + elif self.vcs.version >= (1, 8): args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowserBookmark.style")) else: @@ -751,7 +758,7 @@ Private method to process the buffered output of the hg log command. """ noEntries = 0 - log = {"message": [], "bookmarks": None} + log = {"message": [], "bookmarks": None, "phase": ""} changedPaths = [] initialText = True fileCopies = {} @@ -820,6 +827,8 @@ log["tags"] = value.strip().split(", ") elif key == "bookmarks": log["bookmarks"] = value.strip().split(", ") + elif key == "phase": + log["phase"] = value.strip() else: if initialText: continue @@ -830,7 +839,7 @@ self.__generateLogItem(log["author"], log["date"], log["message"], log["revision"], changedPaths, log["parents"], log["branches"], log["tags"], - log["bookmarks"]) + log["phase"], log["bookmarks"]) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and \ not self.__minDate.isValid(): @@ -842,7 +851,7 @@ if self.__minDate > dt: self.__minDate = dt noEntries += 1 - log = {"message": [], "bookmarks": None} + log = {"message": [], "bookmarks": None, "phase": ""} changedPaths = [] fileCopies = {}
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Feb 06 19:59:32 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Tue Feb 07 19:27:53 2012 +0100 @@ -174,6 +174,11 @@ </column> <column> <property name="text"> + <string>Phase</string> + </property> + </column> + <column> + <property name="text"> <string>Author</string> </property> </column>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon Feb 06 19:59:32 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Tue Feb 07 19:27:53 2012 +0100 @@ -131,7 +131,10 @@ if self.mode == "log": args.append('--copies') args.append('--style') - if self.vcs.version >= (1, 8): + if self.vcs.version >= (2, 1): + args.append(os.path.join(os.path.dirname(__file__), + "styles", "logDialogBookmarkPhase.style")) + elif self.vcs.version >= (1, 8): args.append(os.path.join(os.path.dirname(__file__), "styles", "logDialogBookmark.style")) else: @@ -301,6 +304,9 @@ dstr += '<br />\n' html += dstr + if "phase" in entry: + html += self.trUtf8("Phase: {0}<br />\n").format(entry["phase"]) + html += self.trUtf8("Branches: {0}<br />\n").format(entry["branches"]) html += self.trUtf8("Tags: {0}<br />\n").format(entry["tags"]) @@ -384,7 +390,7 @@ self.endInitialText = True if key in ("change", "branches", "tags", "parents", "user", "date", "file_copies", "file_adds", "files_mods", - "file_dels", "bookmarks"): + "file_dels", "bookmarks", "phase"): self.lastLogEntry[key] = value.strip() elif key == "description": self.lastLogEntry[key] = [value.strip()]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmarkPhase.style Tue Feb 07 19:27:53 2012 +0100 @@ -0,0 +1,15 @@ +changeset = 'change|{rev}:{node|short}\nuser|{author|email}\nparents|{parents}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbranches|{branches}\ntags|{tags}\nbookmarks|{bookmarks}\nphase|{phase}\n@@@\n' +file_mod = '{file_mod}, ' +last_file_mod = '{file_mod}' +file_add = '{file_add}, ' +last_file_add = '{file_add}' +file_del = '{file_del}, ' +last_file_del = '{file_del}' +file_copy = '{name} ({source}), ' +last_file_copy = '{name} ({source})' +tag = '{tag}, ' +last_tag = '{tag}' +branch = '{branch}, ' +last_branch = '{branch}' +bookmark = '{bookmark}, ' +last_bookmark = '{bookmark}'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmarkPhase.style Tue Feb 07 19:27:53 2012 +0100 @@ -0,0 +1,15 @@ +changeset = 'change|{rev}:{node|short}\nbranches|{branches}\ntags|{tags}\nparents|{parents}\nuser|{author}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbookmarks|{bookmarks}\nphase|{phase}\n@@@\n' +file_mod = '{file_mod}, ' +last_file_mod = '{file_mod}' +file_add = '{file_add}, ' +last_file_add = '{file_add}' +file_del = '{file_del}, ' +last_file_del = '{file_del}' +file_copy = '{name} ({source}), ' +last_file_copy = '{name} ({source})' +tag = '{tag}, ' +last_tag = '{tag}' +branch = '{branch}, ' +last_branch = '{branch}' +bookmark = '{bookmark}, ' +last_bookmark = '{bookmark}'
--- a/changelog Mon Feb 06 19:59:32 2012 +0100 +++ b/changelog Tue Feb 07 19:27:53 2012 +0100 @@ -6,6 +6,8 @@ -- added capability to change the colours of the edit area independant from the colours of the system style - Version Control System Interfaces + -- Mercurial + --- added support for Phases as of Mercurial 2.1 -- Subversion --- changed code to make the subversion plug-ins compatible with the new generation working copy meta-data format
--- a/eric5.e4p Mon Feb 06 19:59:32 2012 +0100 +++ b/eric5.e4p Tue Feb 07 19:27:53 2012 +0100 @@ -1307,6 +1307,8 @@ <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmark.style</Other> <Other>README-MacOSX.txt</Other> <Other>default_Mac.e4k</Other> + <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmarkPhase.style</Other> + <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmarkPhase.style</Other> </Others> <MainScript>eric5.py</MainScript> <Vcs>
--- a/i18n/eric5_cs.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_cs.ts Tue Feb 07 19:27:53 2012 +0100 @@ -15313,7 +15313,7 @@ <translation>Filtrováno: </translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>Asociovaný obsah nelze nalézt.</translation> </message> @@ -15378,22 +15378,22 @@ <translation><b>Znovu indexovat dokumentaci</b><p>Přeindexuje dokumentaci.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Aktualizovat index pro hledání</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Vyhledat dokumentaci...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Nefiltrováno</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Engine nápovědy</translation> </message> @@ -15428,7 +15428,7 @@ <translation type="obsolete">Načteno</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Celá obrazovka</translation> </message> @@ -15905,7 +15905,7 @@ <translation><b>Ad Block...</b><p>Otevře dialog pro konfiguraci AdBlock odebírání a pravidel.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>eric5 web prohlížeč</translation> </message> @@ -15955,7 +15955,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation type="unfinished"></translation> </message> @@ -15970,37 +15970,37 @@ <translation type="obsolete">Výchozí</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> + <source>Windows</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> + <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -16060,12 +16060,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -16170,7 +16170,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -18059,7 +18059,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -18089,17 +18089,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -18114,152 +18114,152 @@ <translation>Větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation>Tagy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>Akce</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Cesta</translation> + <source>Action</source> + <translation>Akce</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Cesta</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>Kopírovat z</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation>Stisknout pro získání další části log údajů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>&Další</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Zadejte max. počet, ke stažení</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Vybrat pro zastavení výpisu zpráv pro kopírování neobo přesun</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Stisknout pro porovnání dvou revizí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>&Porovnat revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>Ode&slat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Zadejte data, která se odešlou do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Přidáno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Smazáno</translation> + <source>Added</source> + <translation>Přidáno</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Smazáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation>Hg proces neskončil do 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>Hg proces neskončil do 30s.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation>Nelze spustit hg program.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -18269,22 +18269,22 @@ <translation>Graf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation>Stisknout pro generování diffu s první rodičovskou revizí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation>Diff s rodičem &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Stisknout pro generování diffu s druhou rodičovskou revizí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation>Diff s rodičem &2</translation> </message> @@ -18299,22 +18299,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -18324,15 +18324,20 @@ <translation type="obsolete">Obnovit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18412,102 +18417,108 @@ <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation>Nelze spustit hg program.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_de.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_de.ts Tue Feb 07 19:27:53 2012 +0100 @@ -15012,7 +15012,7 @@ <translation>Filter: </translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>Konnte keinen zugehörigen Inhalt finden.</translation> </message> @@ -15077,22 +15077,22 @@ <translation><b>Dokumentation reindizieren</b><p>Reindiziert die Dokumentation.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Aktualisiere Suchindex</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Suche nach Dokumentation...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Ungefiltert</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Hilfe</translation> </message> @@ -15112,7 +15112,7 @@ <translation><b>Privates Browsen</b><p>Schaltet das private Browsen ein. In diesem Modus wird keine Chronik mehr aufgezeichnet.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Vollbild</translation> </message> @@ -15544,7 +15544,7 @@ <translation><b>Ad Block...</b><p>Öffnet einen Dialog zum konfigurieren von AdBlock Abonnements und Regeln</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>eric5 Web-Browser</translation> </message> @@ -15589,7 +15589,7 @@ <translation>Such&maschinen verwalten...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation><b>Sind sie sicher, dass sie privates Browsen einschalten möchten?</b><p>Wenn das private Browsen eingeschaltet ist, werden keine Web Seiten mehr zur Chronik hinzugefügt und Suchanfragen, Web Site Icons und Cookies werden nicht mehr gespeichert. HTML5 Offline Speicher wird deaktiviert. Bis das Fenster geschlossen wird, können sie jedoch weiterhin die Zurück und Vorwärts Knöpfe nutzen, um zu besuchten Web Seiten zurückzukehren.</p></translation> </message> @@ -15604,37 +15604,37 @@ <translation type="obsolete">User Agent</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation>ISCII</translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation>Unicode</translation> + <source>Windows</source> + <translation>Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation>Sonstige</translation> + <source>ISCII</source> + <translation>ISCII</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation>Unicode</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation>Sonstige</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation>Standardkodierung</translation> </message> @@ -15694,12 +15694,12 @@ <translation>Aktuelle Seite prüfen</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation>VirusTotal Prüfung</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>Die VirusTotal Prüfung konnte nicht beauftragt werden.<p> @@ -15805,7 +15805,7 @@ <translation><b>eric5 Web Browser - {0}</b><p>Der eric5-Web-Browser ist eine kombinierte Anzeige für Hilfe- und HTML-Dateien. Er ist Bestandteil der eric5 Entwicklungsumgebung.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation>Fenster wiederherstellen</translation> </message> @@ -17661,7 +17661,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -17691,17 +17691,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -17716,142 +17716,142 @@ <translation>Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>Aktion</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Pfad</translation> + <source>Action</source> + <translation>Aktion</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Pfad</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>Kopiert von</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation>Drücken, um die nächsten Log-Einträge zu erhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>&Nächste</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial Log Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Hinzugefügt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Gelöscht</translation> + <source>Added</source> + <translation>Hinzugefügt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation>Das hg Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -17861,32 +17861,32 @@ <translation>Grafik</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation>Drücken, um ein Diff zum ersten Vorgänger zu erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation>Diff zu Vorgänger &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Drücken, um ein Diff zum zweiten Vorgänger zu erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation>Diff zu Vorgänger &2</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> @@ -17901,35 +17901,40 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Eingang)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Ausgang)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <source>Press to refresh the list of changesets</source> + <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> - <source>Press to refresh the list of changesets</source> - <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation>Phase</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18009,109 +18014,116 @@ <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation>Kein Log für '{0}' verfügbar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation>Zweige: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation>Marken: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation>Vorgänger: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> <source>Added {0}<br /> </source> <translation>Hinzugefügt: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> <source>Modified {0}<br /> </source> <translation>Modifiziert: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation>Gelöscht: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation>Das hg Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Hinzugefügt: {0} (kopiert von {1})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation>Lesezeichen: {0}<br /> </translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation>Phase: {0}<br /> +</translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_en.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_en.ts Tue Feb 07 19:27:53 2012 +0100 @@ -14180,7 +14180,7 @@ <context> <name>HelpWindow</name> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -15037,7 +15037,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation type="unfinished"></translation> </message> @@ -15482,67 +15482,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> - <source>ISO</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> + <source>ISO</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> + <source>Windows</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> + <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -15602,12 +15602,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -15712,7 +15712,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -17544,7 +17544,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -17584,17 +17584,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -17614,205 +17614,210 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> + <source>Action</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> + <source>Added</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <source>Press to refresh the list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> - <source>Press to refresh the list of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -17892,100 +17897,106 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> - <source>Modified {0}<br /> + <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <source>Modified {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_es.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_es.ts Tue Feb 07 19:27:53 2012 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es"> +<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1638,8 +1637,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1857,8 +1856,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> </context> <context> @@ -12983,7 +12982,7 @@ <name>HelpBrowser</name> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="837"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Abrir enlace en Nueva Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> @@ -15174,7 +15173,7 @@ <translation>Filtrado por:</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>No se ha podido encontrar un contenido asociado.</translation> </message> @@ -15239,22 +15238,22 @@ <translation><b>Reindexar Documentación</b><p>Reindexa el conjunto de documentación.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Actualizando índice de búsqueda</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Buscando Documentación...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Sin filtrar</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Motor de Ayuda</translation> </message> @@ -15274,7 +15273,7 @@ <translation><b>Navegación Privada</b><p>Habilita navegación privada. En este modo, el historial no queda registrado.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Pantalla Completa</translation> </message> @@ -15741,7 +15740,7 @@ <translation><b>Ad Block...</b><p>Abre un diálogo para configurar las suscripciones y reglas de AdBlock</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>Navegador Web de eric5</translation> </message> @@ -15786,7 +15785,7 @@ <translation>Configurar Motor&es de Búsqueda...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation><b>¿Está seguro de que desea activar la navegación privada?</b><p>Cuando la navegación privada ha sido activada, las páginas web no se añaden al historial, las búsquedas no se añaden a la lista de búsquedas recientes, y los iconos de website y las cookies no son almacenados. El almacenamiento offline de HTML5 tambien es desactivado. Hasta que la ventana sea cerrada, todavía se pueden utilizar los botones de Atrás y Adelante para retornar a las páginas web que hayan sido navegadas.</p></translation> </message> @@ -15801,37 +15800,37 @@ <translation type="obsolete">Agente de Usuario</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation>ISCII</translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation>Unicode</translation> + <source>Windows</source> + <translation>Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation>Otro</translation> + <source>ISCII</source> + <translation>ISCII</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation>Unicode</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation>Otro</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation>Codificación por Defecto</translation> </message> @@ -15891,12 +15890,12 @@ <translation>Analizar sitio actual</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation>Análisis con VirusTotal</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>El análisis con VirusTotal no se ha podido programar.<p> @@ -15978,14 +15977,12 @@ <location filename="Helpviewer/HelpWindow.py" line="785"/> <source>Zoom In</source> <comment>View|Zoom in</comment> - <translatorcomment>Ver|Aumentar Zoom</translatorcomment> <translation>Aumentar Zoom</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="800"/> <source>Zoom Out</source> <comment>View|Zoom out</comment> - <translatorcomment>Ver|Disminuir Zoom</translatorcomment> <translation>Disminuir Zoom</translation> </message> <message> @@ -16009,7 +16006,7 @@ <translation><b>Navegador Web de eric5- {0}</b><p>El Navegador Web de eric5 is una combación de navegador de archivos de ayuda y de HTML. Es parte del conjunto de herramientas de desarrollo de eric5.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation>Restaurar Ventana</translation> </message> @@ -17910,7 +17907,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -17940,17 +17937,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -17960,132 +17957,132 @@ <translation>Introduzca la expresión regular de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>Acción</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Ruta</translation> + <source>Action</source> + <translation>Acción</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Ruta</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>Copiar desde</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation>Pulse para recuperar el siguiente conjunto de entradas de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>Siguie&nte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Introduzca el límite de entradas a recuperar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Detener en copy/move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Añadido</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Borrado</translation> + <source>Added</source> + <translation>Añadido</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Borrado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -18095,22 +18092,22 @@ <translation>Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation>El proceso hg no terminó en un plazo de 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> - <translation>No se ha podido iniciar el ejecutable de hg.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation>No se ha podido iniciar el ejecutable de hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -18120,22 +18117,22 @@ <translation>Gráficos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation>Pulse para generar un diff con la primera revisión padre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation>Diff con el padre &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Pulse para generar un diff con la segunda revisión padre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation>Diff con el padre &2</translation> </message> @@ -18150,35 +18147,40 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <source>Press to refresh the list of changesets</source> + <translation>Pulsar para actualizar la lista de changesets</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> - <source>Press to refresh the list of changesets</source> - <translation>Pulsar para actualizar la lista de changesets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18258,110 +18260,116 @@ <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation>No se ha podido iniciar el ejecutable de hg.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation>No se ha podido iniciar el ejecutable de hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Añadido {0} (copiado de {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation>Marcadores: {0}<br /> </translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -50260,14 +50268,12 @@ <location filename="ViewManager/ViewManager.py" line="2740"/> <source>Zoom In</source> <comment>View|Zoom in</comment> - <translatorcomment>Ver|Aumentar Zoom</translatorcomment> <translation>Aumentar Zoom</translation> </message> <message> <location filename="ViewManager/ViewManager.py" line="2757"/> <source>Zoom Out</source> <comment>View|Zoom out</comment> - <translatorcomment>Ver|Disminuir Zoom</translatorcomment> <translation>Disminuir Zoom</translation> </message> </context>
--- a/i18n/eric5_fr.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_fr.ts Tue Feb 07 19:27:53 2012 +0100 @@ -16520,7 +16520,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> @@ -16585,22 +16585,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> @@ -16620,7 +16620,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation type="unfinished"></translation> </message> @@ -17052,7 +17052,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -17097,7 +17097,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation type="unfinished"></translation> </message> @@ -17112,37 +17112,37 @@ <translation type="obsolete">Défaut</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation type="unfinished">Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation type="unfinished">Unicode</translation> + <source>Windows</source> + <translation type="unfinished">Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation type="unfinished">Autre</translation> + <source>ISCII</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation type="unfinished">Unicode</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation type="unfinished">Autre</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -17202,12 +17202,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -17312,7 +17312,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -19168,7 +19168,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -19198,17 +19198,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -19223,27 +19223,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation type="unfinished">Action</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation type="unfinished">Chemin</translation> + <source>Action</source> + <translation type="unfinished">Action</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation type="unfinished">Chemin</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation type="unfinished">Copie depuis</translation> </message> @@ -19253,27 +19253,27 @@ <translation type="obsolete">Copie depuis Rév</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished">Cliquer pour obtenir les messages log suivants</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation type="unfinished">&Suivant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">Entrer le nombre de messages max à rechercher</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">Cocher pour arrêter le listing des messages de log lors d'une copie ou d'un déplacement</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation type="unfinished">Arrêt lors de copie/déplacement</translation> </message> @@ -19288,102 +19288,102 @@ <translation type="obsolete">&Diff vs précédent</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation type="unfinished">Cliquer pour comparer deux versions</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation type="unfinished">&Comparer des versions</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation type="unfinished">Entrée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation type="unfinished">&Envoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation type="unfinished">Ajouté</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation type="unfinished"></translation> + <source>Added</source> + <translation type="unfinished">Ajouté</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -19393,22 +19393,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -19423,22 +19423,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> @@ -19448,15 +19448,20 @@ <translation type="obsolete">Rafraichir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -19536,100 +19541,106 @@ <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> - <source>Modified {0}<br /> + <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <source>Modified {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_it.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_it.ts Tue Feb 07 19:27:53 2012 +0100 @@ -15169,27 +15169,27 @@ <translation>Filtrato per:</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>Non posso trovare un contenuto associato.</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Aggiornamento indice di ricerca</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Ricerca documentazione...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Non filtrato</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Motore di help</translation> </message> @@ -15209,7 +15209,7 @@ <translation><b>Navigazione anonima</b><p>Attiva la navigazione anonima. In questa modalità la cronologia non è più registrata.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Tutto schermo</translation> </message> @@ -15676,7 +15676,7 @@ <translation><b>Ad Block...</b><p>Apre un dialogo per configurare le regole di sottoscrizione di AdBlock.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>Web Browser di eric5</translation> </message> @@ -15721,7 +15721,7 @@ <translation>Configura motori di &ricerca...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation><b>Sei sicuro di voler attivare la navigazione riservata?</b><p>Quando la navigazione riservata è attivata, le pagine web non sono aggiunte alla cronologia, le ricerche non sono aggiunte alla lista delle ultime ricerche e le icone dei siti e i cookie non sono salvati, l'offline storage di HTML5 viene disattivato. Fino alla chiusura della finestra, puoi premere sui pulsanti Precedente e Successivo per tornare alle pagine web che hai visitato.</p></translation> </message> @@ -15736,37 +15736,37 @@ <translation type="obsolete">User Agent</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation>ISCII</translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation>Unicode</translation> + <source>Windows</source> + <translation>Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation>Altro</translation> + <source>ISCII</source> + <translation>ISCII</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation>Unicode</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation>Altro</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation>Encoding di default</translation> </message> @@ -15826,12 +15826,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -15936,7 +15936,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -17820,7 +17820,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -17850,17 +17850,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Autore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -17875,152 +17875,152 @@ <translation>Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>Azione</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Percorso</translation> + <source>Action</source> + <translation>Azione</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Percorso</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>Copia da</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation>Premi per predere il prossimo blocco di entry del log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>Succ&essivo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Inserisci il limite degli elementi da scaricare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleziona per fermare l'ascolto dei messaggi di log al copy o al move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Ferma su Copy/Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Premi per confrontare due revisioni</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>&Confronta revisioni</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Premi per spedire l'input al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>&Spedisci</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Inserisci i dati da inviare al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Seleziona per impostare il campo di input in modalità password</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>Modo &Password</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Aggiunto</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Cancellato</translation> + <source>Added</source> + <translation>Aggiunto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Cancellato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation>Il processo hg non è finito entro i 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> - <translation>Non posso avviare l'eseguibile hg.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation>Non posso avviare l'eseguibile hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -18030,22 +18030,22 @@ <translation>Graph</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation>Premi per generare un diff con la revisione precedente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation>Diff con il predecessore &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Premi per generare un diff con la seconda revisione precedente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation>Diff con il predecessore &2</translation> </message> @@ -18060,35 +18060,40 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Incoming)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <source>Press to refresh the list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> - <source>Press to refresh the list of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18168,109 +18173,115 @@ <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation>Nessun log disponibile per '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>diff su {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autore: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Data: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> <source>Added {0}<br /> </source> <translation>Aggiunti: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> <source>Modified {0}<br /> </source> <translation>Modificati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation>Cancellati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation>Non posso avviare l'eseguibile hg.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation>Non posso avviare l'eseguibile hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Aggiunti {0} (copiati da {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_ru.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_ru.ts Tue Feb 07 19:27:53 2012 +0100 @@ -15216,7 +15216,7 @@ <translation>Фильтровать по:</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>Невозможно найти соответствующее содержание.</translation> </message> @@ -15281,22 +15281,22 @@ <translation><b>Переиндексировать документацию</b><p>Переиндексировать документацию.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Обновление поискового индекса</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Идёт поиск помощи...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Нефильтрованное</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Просмотрщик помощи</translation> </message> @@ -15316,7 +15316,7 @@ <translation><b>Личный просмотр</b><p>Разрешает режим личного просмотра. В этом режиме история не сохраняется.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Полный экран</translation> </message> @@ -15783,7 +15783,7 @@ <translation><b>Ad Block...</b><p>Показать диалог для настройки AdBlock подписок и правил.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>WEB просмотрщик встроенный в Eric5</translation> </message> @@ -15828,7 +15828,7 @@ <translation>Настройка &поисковиков...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation><b>Подтвердите включение закрытого режима.</b><p>В закрытом режиме посещённые WEB страницы не сохраняются в истории, поиски не сохраняються в списке последних поисков, иконки сайтов и cookies так же не сохраняются. HTML5 автономное хранилище будет выключено. Пока текущее окно не закрыто, переход вперёд и назад на просмотренные уже страницы всё же будет работать.</p></translation> </message> @@ -15838,37 +15838,37 @@ <translation>Кодировка текста</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation></translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation>Юникод</translation> + <source>Windows</source> + <translation>Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation>Другое</translation> + <source>ISCII</source> + <translation></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation>Юникод</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation>Другое</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation>Кодировка по умолчанию</translation> </message> @@ -15928,12 +15928,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -16038,7 +16038,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -17917,7 +17917,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -17947,17 +17947,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -17967,133 +17967,133 @@ <translation>Задайте регулярное выражения для фильтра</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>Действие</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Путь</translation> + <source>Action</source> + <translation>Действие</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Путь</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>Копировать из</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation>Нажмите для получения следующей части сообщений журнала</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество записей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>Нажмите, чтобы сравнить две версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>&Сравнить версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation>Alt+О</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Добавлено</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Удалено</translation> + <source>Added</source> + <translation>Добавлено</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Удалено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -18103,22 +18103,22 @@ <translation>Ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation>Процесс hg не завершился в течение 30 секунд.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation>Невозможно запустить исполняемый файл hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -18128,22 +18128,22 @@ <translation>Граф</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation>Создание сравнения с предыдущей версией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation>Сравнить с предком &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation>Создание сравнения с пред-предыдущей версией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation>Сравнить с предком &2</translation> </message> @@ -18158,22 +18158,22 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation>лог (входящий)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>лог (исходящий)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -18183,15 +18183,20 @@ <translation type="obsolete">Обновить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18271,109 +18276,115 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation>Невозможно запустить исполняемый файл hg.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_tr.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_tr.ts Tue Feb 07 19:27:53 2012 +0100 @@ -14549,7 +14549,7 @@ <context> <name>HelpWindow</name> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation>Eric5 Web Gözatıcısı</translation> </message> @@ -15406,7 +15406,7 @@ <translation><b>Sayfa kaynağını göster</b><p>Sayfa kaynağını bir düzenleyicide göster.</p></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation>Tam Ekran</translation> </message> @@ -15896,27 +15896,27 @@ <translation type="obsolete">Yükleme bitirildi</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation>Birleştirilmiş bir içerek bulunamadı.</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation>Arama index yenileniyor</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation>Dökümanlara bakılıyor...</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation>Süzülmemiş</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation>Yardım Motoru</translation> </message> @@ -16001,42 +16001,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> - <source>ISO</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> + <source>ISO</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation>Evrensel kod</translation> + <source>Windows</source> + <translation>Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation>Diğer</translation> + <source>ISCII</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation>Evrensel kod</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation>Diğer</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation>Varsayılan Kodlama</translation> </message> @@ -16061,12 +16061,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -16171,7 +16171,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -18047,7 +18047,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> @@ -18077,17 +18077,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -18107,172 +18107,172 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation>İşlem</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation>Yol</translation> + <source>Action</source> + <translation>İşlem</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation>Yol</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation>den Kopyala</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation>So&nraki</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation>Kopyalama/Taşımıyı Durdur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation>İki düzenlemeyi karşılaştırmak için basınız</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation>Gözden Geçirmeleri Karşılaş&tır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation>Hatalar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation>Girdi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation>Hg işlem girdilerini göndermek için basınız</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation>&Gönder</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation>Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation>&Parola Modu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation>Eklendi</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation>Silindi</translation> + <source>Added</source> + <translation>Eklendi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation>Silindi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -18287,22 +18287,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> @@ -18312,15 +18312,20 @@ <translation type="obsolete">Tazele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18400,100 +18405,106 @@ <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation>{0}ne farkı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> - <source>Modified {0}<br /> + <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <source>Modified {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon Feb 06 19:59:32 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue Feb 07 19:27:53 2012 +0100 @@ -16481,7 +16481,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2190"/> + <location filename="Helpviewer/HelpWindow.py" line="2192"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> @@ -16546,22 +16546,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2299"/> + <location filename="Helpviewer/HelpWindow.py" line="2301"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2351"/> + <location filename="Helpviewer/HelpWindow.py" line="2353"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2381"/> + <location filename="Helpviewer/HelpWindow.py" line="2383"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2400"/> + <location filename="Helpviewer/HelpWindow.py" line="2402"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> @@ -16581,7 +16581,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1932"/> + <location filename="Helpviewer/HelpWindow.py" line="1934"/> <source>Full Screen</source> <translation type="unfinished"></translation> </message> @@ -17013,7 +17013,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2360"/> + <location filename="Helpviewer/HelpWindow.py" line="2362"/> <source>eric5 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -17058,7 +17058,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1961"/> + <location filename="Helpviewer/HelpWindow.py" line="1963"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation type="unfinished"></translation> </message> @@ -17073,37 +17073,37 @@ <translation type="obsolete">默认</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2715"/> + <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2716"/> - <source>Windows</source> - <translation type="unfinished">Windows</translation> - </message> - <message> - <location filename="Helpviewer/HelpWindow.py" line="2717"/> - <source>ISCII</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2718"/> - <source>Unicode</source> - <translation type="unfinished">Unicode</translation> + <source>Windows</source> + <translation type="unfinished">Windows</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2719"/> - <source>Other</source> - <translation type="unfinished">其它</translation> + <source>ISCII</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="2720"/> + <source>Unicode</source> + <translation type="unfinished">Unicode</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2721"/> + <source>Other</source> + <translation type="unfinished">其它</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="2722"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2742"/> + <location filename="Helpviewer/HelpWindow.py" line="2744"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -17163,12 +17163,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2918"/> + <location filename="Helpviewer/HelpWindow.py" line="2920"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -17273,7 +17273,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1938"/> + <location filename="Helpviewer/HelpWindow.py" line="1940"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> @@ -19129,7 +19129,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -19159,17 +19159,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -19184,27 +19184,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Date</source> <translation type="unfinished">数据</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> - <source>Action</source> - <translation type="unfinished">动作</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> - <source>Path</source> - <translation type="unfinished">路径</translation> + <source>Action</source> + <translation type="unfinished">动作</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> + <source>Path</source> + <translation type="unfinished">路径</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> <source>Copy from</source> <translation type="unfinished">复制自</translation> </message> @@ -19214,27 +19214,27 @@ <translation type="obsolete">从修订复制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished">点击获得日志条目的下一个分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>&Next</source> <translation type="unfinished">下一个(&N)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="270"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">输入要提取条目的限制</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">选择在复制或移动时停止列出日志消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Stop on Copy/Move</source> <translation type="unfinished">复制或移动时停止</translation> </message> @@ -19249,102 +19249,102 @@ <translation type="obsolete">与上一次的差异(&D)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="332"/> <source>Press to compare two revisions</source> <translation type="unfinished">点击比较两次修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>&Compare Revisions</source> <translation type="unfinished">比较修订(&C)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Input</source> <translation type="unfinished">输入</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>&Send</source> <translation type="unfinished">发送(&S)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>&Password Mode</source> <translation type="unfinished">密码模式(&P)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Added</source> - <translation type="unfinished">已添加</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> - <source>Deleted</source> - <translation type="unfinished">已删除</translation> + <source>Added</source> + <translation type="unfinished">已添加</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <source>Deleted</source> + <translation type="unfinished">已删除</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -19354,22 +19354,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -19384,22 +19384,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> @@ -19409,15 +19409,20 @@ <translation type="obsolete">刷新</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -19497,100 +19502,106 @@ <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="330"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> - <source>Modified {0}<br /> + <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <source>Modified {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="232"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <source>Phase: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>