Wed, 09 May 2012 20:07:29 +0200
Added support for amending commits as of Mercurial 2.2.
--- a/APIs/Python3/eric5.api Sat May 05 19:23:18 2012 +0200 +++ b/APIs/Python3/eric5.api Wed May 09 20:07:29 2012 +0200 @@ -3693,6 +3693,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog?1(argvList, ppath, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.accepted?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.amend?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.logMessage?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_buttonBox_accepted?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_buttonBox_clicked?4(button)
--- a/Documentation/Help/source.qhp Sat May 05 19:23:18 2012 +0200 +++ b/Documentation/Help/source.qhp Wed May 09 20:07:29 2012 +0200 @@ -5075,6 +5075,7 @@ <keyword name="HgCommitDialog" id="HgCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog" /> <keyword name="HgCommitDialog (Constructor)" id="HgCommitDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.__init__" /> <keyword name="HgCommitDialog (Module)" id="HgCommitDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html" /> + <keyword name="HgCommitDialog.amend" id="HgCommitDialog.amend" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.amend" /> <keyword name="HgCommitDialog.logMessage" id="HgCommitDialog.logMessage" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.logMessage" /> <keyword name="HgCommitDialog.on_buttonBox_accepted" id="HgCommitDialog.on_buttonBox_accepted" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.on_buttonBox_accepted" /> <keyword name="HgCommitDialog.on_buttonBox_clicked" id="HgCommitDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.on_buttonBox_clicked" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Sat May 05 19:23:18 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Wed May 09 20:07:29 2012 +0200 @@ -70,6 +70,9 @@ <td><a href="#HgCommitDialog.__init__">HgCommitDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgCommitDialog.amend">amend</a></td> +<td>Public method to retrieve the state of the amend flag.</td> +</tr><tr> <td><a href="#HgCommitDialog.logMessage">logMessage</a></td> <td>Public method to retrieve the log message.</td> </tr><tr> @@ -106,6 +109,16 @@ <dd> parent widget (QWidget) </dd> +</dl><a NAME="HgCommitDialog.amend" ID="HgCommitDialog.amend"></a> +<h4>HgCommitDialog.amend</h4> +<b>amend</b>(<i></i>) +<p> + Public method to retrieve the state of the amend flag. +</p><dl> +<dt>Returns:</dt> +<dd> +state of the amend flag (boolean) +</dd> </dl><a NAME="HgCommitDialog.logMessage" ID="HgCommitDialog.logMessage"></a> <h4>HgCommitDialog.logMessage</h4> <b>logMessage</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sat May 05 19:23:18 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed May 09 20:07:29 2012 +0200 @@ -350,7 +350,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -properly formated url for subversion (string) +properly formated url for mercurial (string) </dd> </dl><a NAME="Hg.__iniFileChanged" ID="Hg.__iniFileChanged"></a> <h4>Hg.__iniFileChanged</h4> @@ -506,7 +506,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -flag indicating successfull operation (boolean) +flag indicating successful operation (boolean) </dd> </dl><a NAME="Hg.hgCreateIgnoreFile" ID="Hg.hgCreateIgnoreFile"></a> <h4>Hg.hgCreateIgnoreFile</h4> @@ -738,7 +738,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -properly normalized url for subversion (string) +properly normalized url for mercurial (string) </dd> </dl><a NAME="Hg.hgOutgoing" ID="Hg.hgOutgoing"></a> <h4>Hg.hgOutgoing</h4>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sat May 05 19:23:18 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Wed May 09 20:07:29 2012 +0200 @@ -34,6 +34,9 @@ """ super().__init__(parent, Qt.WindowFlags(Qt.Window)) self.setupUi(self) + + if vcs.version < (2, 2): + self.amendCheckBox.setEnabled(False) def showEvent(self, evt): """ @@ -65,6 +68,14 @@ self.recentCommitMessages) return msg + def amend(self): + """ + Public method to retrieve the state of the amend flag. + + @return state of the amend flag (boolean) + """ + return self.amendCheckBox.isChecked() + def on_buttonBox_clicked(self, button): """ Private slot called by a button of the button box clicked.
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui Sat May 05 19:23:18 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui Wed May 09 20:07:29 2012 +0200 @@ -7,13 +7,13 @@ <x>0</x> <y>0</y> <width>450</width> - <height>384</height> + <height>353</height> </rect> </property> <property name="windowTitle"> <string>Mercurial</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QGroupBox" name="logGroup"> <property name="title"> @@ -55,6 +55,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="amendCheckBox"> + <property name="toolTip"> + <string>Select to amend the last commit (leave message empty to keep it)</string> + </property> + <property name="text"> + <string>Amend the last commit</string> + </property> + </widget> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -71,6 +81,7 @@ <tabstops> <tabstop>logEdit</tabstop> <tabstop>recentComboBox</tabstop> + <tabstop>amendCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat May 05 19:23:18 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed May 09 20:07:29 2012 +0200 @@ -427,10 +427,13 @@ if self.__commitDialog is not None: msg = self.__commitDialog.logMessage() + amend = self.__commitDialog.amend() self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2) self.__commitDialog = None + else: + amend = False - if not msg: + if not msg and not amend: msg = '***' args = [] @@ -440,8 +443,11 @@ args.append("-v") if closeBranch: args.append("--close-branch") - args.append("--message") - args.append(msg) + if amend: + args.append("--amend") + if msg: + args.append("--message") + args.append(msg) if isinstance(name, list): dname, fnames = self.splitPathList(name) else: @@ -1270,7 +1276,7 @@ ).format(self.versionStr, url, "\n".join(info)) ############################################################################ - ## Private Subversion specific methods are below. + ## Private Mercurial specific methods are below. ############################################################################ def __hgURL(self, url): @@ -1278,7 +1284,7 @@ Private method to format a url for Mercurial. @param url unformatted url string (string) - @return properly formated url for subversion (string) + @return properly formated url for mercurial (string) """ url = self.hgNormalizeURL(url) url = url.split(':', 2) @@ -1307,7 +1313,7 @@ Public method to normalize a url for Mercurial. @param url url string (string) - @return properly normalized url for subversion (string) + @return properly normalized url for mercurial (string) """ url = url.replace('\\', '/') if url.endswith('/'): @@ -1321,7 +1327,7 @@ @param name file/directory name to be copied (string) @param project reference to the project object - @return flag indicating successfull operation (boolean) + @return flag indicating successful operation (boolean) """ dlg = HgCopyDialog(name) res = False
--- a/changelog Sat May 05 19:23:18 2012 +0200 +++ b/changelog Wed May 09 20:07:29 2012 +0200 @@ -8,6 +8,9 @@ -- added the capability to search in the output of the shell window - Terminal -- added the capability to search in the output of the terminal window +- Version Control System Interfaces + -- Mercurial + --- added support for amending commits as of Mercurial 2.2 Version 5.3-snapshot-20120430: - bug fixes
--- a/i18n/eric5_cs.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_cs.ts Wed May 09 20:07:29 2012 +0200 @@ -1001,17 +1001,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Parsování modulů...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Aplikace>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Ostatní>></translation> </message> @@ -4110,42 +4110,42 @@ <translation>&Filtr pro:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Generování kódu</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>uic chyba</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Vytvořit Dialog Code</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Soubor <b>{0}</b> existuje ale neobsahuje žádné třídy.</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Byla nalezena chyba načtená z <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Template soubor <b>{0}</b> nelze otevřít.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Nelze ovevřít source soubor "{0}".</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Nelze zapsat do source souboru "{0}".</p><p>Důvod: {1}</p></translation> </message> @@ -16957,47 +16957,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -17012,112 +17012,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -17127,82 +17127,82 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -18057,6 +18057,16 @@ <source>Select a recent commit message to use</source> <translation>Výběr zprávu posledního zápisu změn k použití</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -24102,12 +24112,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Parsování modulů...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation>Adresář <b>'{0}'</b> není Python balíček.</translation> </message> @@ -28077,22 +28087,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Parsování modulů...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation>Adresář <b>'{0}'</b> není balíček.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation>Balíček <b>'{0}'</b> neobsahuje žádné moduly.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation>Balíček <b>'{0}'</b> neobsahuje žádné třídy.</translation> </message> @@ -36736,7 +36746,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -47330,12 +47340,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>Modul <b>'{0}'</b> nebyl nalezen.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>Modul <b>'{0}'</b> neobsahuje žádné třídy.</translation> </message> @@ -54545,30 +54555,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54579,23 +54589,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54603,7 +54613,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_de.ts Wed May 09 20:07:29 2012 +0200 @@ -991,17 +991,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Module werden gelesen...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Applikation>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Sonstige>></translation> </message> @@ -4027,42 +4027,42 @@ <translation>&Filtere mit:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Code Erzeugung</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Codevorlagedatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>uic Fehler</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Es gab einen Fehler beim Laden des Formulars <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Formularcode Generator</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Die datei <b>{0}</b> existiert, enthält jedoch keine Klassen.</translation> </message> @@ -16507,237 +16507,237 @@ <translation>Klone das Projekt aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation>.hgignore Datei erstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation>Projektverzeichnis identifizieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation>.hgignore Datei erstellen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> @@ -17570,6 +17570,16 @@ <source>Select a recent commit message to use</source> <translation>Wähle eine zu verwendende Änderungsbeschreibung</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation>Auswählen, um die letzte Änderung zu ergänzen (Beschreibung leer lassen, um die vorhandene zu behalten)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation>Letzte Änderung ergänzen</translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -23553,12 +23563,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Module werden gelesen...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation>Das Verzeichnis <b>'{0}'</b> ist kein Python Package.</translation> </message> @@ -27188,22 +27198,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Module werden gelesen...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation>Das Verzeichnis <b>'{0}'</b> ist kein Package.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation>Das Package <b>'{0}'</b> enthält keine Module.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation>Das Package <b>'{0}'</b> enthält keine Klassen.</translation> </message> @@ -35573,7 +35583,7 @@ <translation>Alle hervorheben</translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation>'{0}' wurde nicht gefunden.</translation> </message> @@ -46091,12 +46101,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>Das Modul <b>'{0}'</b> konnte nicht gefunden werden.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>Das Modul <b>'{0}'</b> enthält keine Klassen.</translation> </message> @@ -53021,24 +53031,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -53047,7 +53057,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53064,24 +53074,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53092,7 +53102,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_en.ts Wed May 09 20:07:29 2012 +0200 @@ -970,17 +970,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation type="unfinished"></translation> </message> @@ -3989,42 +3989,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -16415,237 +16415,237 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -17470,6 +17470,16 @@ <source>Select a recent commit message to use</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -23406,12 +23416,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation type="unfinished"></translation> </message> @@ -27039,22 +27049,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -35244,7 +35254,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -45637,12 +45647,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -52548,30 +52558,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52582,23 +52592,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -52606,7 +52616,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_es.ts Wed May 09 20:07:29 2012 +0200 @@ -987,17 +987,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Analizando modulos...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Aplicación>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Otros>></translation> </message> @@ -4026,42 +4026,42 @@ <translation>Filtrar c&on:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>error de uic</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Generación de Código</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Generar código de Diálogo</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>El archivo <b>{0}</b> existe pero no contiene ninguna clase.</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Ha ocurrido un error al cargar el formulario <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>No se ha podido cargar el archivo con la plantilla de código "{0}".</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>No se ha podido abrir el archivo de codigo fuente "{0}".</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>No se ha podido escribir en el archivo de codigo fuente "{0}".</p><p>Razón: {1}</p></translation> </message> @@ -16506,237 +16506,237 @@ <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation>¿Debe ser actualizado el directorio de trabajo?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation>Mostrando la branch actual</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Subcomando bisect ({0}) inválido.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation>Identificando directorio de proyecto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation>Crear archivo .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Archivos Changegroup de Mercurial (*.hg)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation>¿Debe ser actualizado el directorio de trabajo?</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation>Mostrando la branch actual</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Subcomando bisect ({0}) inválido.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation>Identificando directorio de proyecto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation>Crear archivo .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Archivos Changegroup de Mercurial (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> @@ -17569,6 +17569,16 @@ <source>Select a recent commit message to use</source> <translation>Seleccione un mensaje de commit reciente para utilizar</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -23554,12 +23564,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Analizando módulos...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation>El directorio <b>'{0}'</b> no es un paquete Python.</translation> </message> @@ -27189,22 +27199,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Analizando modulos...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation>El directorio <b>'{0}'</b> no es un paquete.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation>El paquete <b>'{0}'</b> no contiene ningún módulo.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation>El paquete <b>'{0}'</b> no contiene ninguna clase.</translation> </message> @@ -46046,12 +46056,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>No se encuentra el módulo <b>'{0}'</b>.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>El módulo <b>'{0}'</b> no contiene ninguna clase.</translation> </message> @@ -52972,17 +52982,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -52993,31 +53003,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -53026,7 +53036,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53043,7 +53053,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_fr.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_fr.ts Wed May 09 20:07:29 2012 +0200 @@ -1073,17 +1073,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Analyse des modules...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Application>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Autres>></translation> </message> @@ -4272,7 +4272,7 @@ <translation>Filtrer &avec:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Génération de code</translation> </message> @@ -4292,7 +4292,7 @@ <translation type="obsolete"><p>Impossible d'écrire le fichier source "%1".</p><p>Raison: %2</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>erreur uic</translation> </message> @@ -4302,7 +4302,7 @@ <translation type="obsolete"><p>Erreur lors du chargement de la feuille <b>%1</b>.</p><p>%2</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Création du code de boite de dialogue</translation> </message> @@ -4317,27 +4317,27 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -18025,47 +18025,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18075,192 +18075,192 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19101,6 +19101,16 @@ <source>Select a recent commit message to use</source> <translation type="unfinished">Sélectionner un message de commit</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -25144,7 +25154,7 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Analyse des modules...</translation> </message> @@ -25154,7 +25164,7 @@ <translation type="obsolete">Le répertoire <b>'%1'</b> n'est pas un package Python.</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation type="unfinished"></translation> </message> @@ -29452,7 +29462,7 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Analyse des modules...</translation> </message> @@ -29472,17 +29482,17 @@ <translation type="obsolete">Le package <b>'%1'</b> ne contient aucune classe.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -39246,7 +39256,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -50608,12 +50618,12 @@ <translation type="obsolete">Le module <b>'%1'</b> ne contient aucune classe.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -58416,30 +58426,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58450,23 +58460,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -58474,7 +58484,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_it.ts Wed May 09 20:07:29 2012 +0200 @@ -1001,17 +1001,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Analisi moduli...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Applicazione>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Altri>></translation> </message> @@ -4101,42 +4101,42 @@ <translation>&Filtra con:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Generazione del codice</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>errore uic</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Crea il codice del dialogo</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Il file <b>{0}</b> esiste ma non contiene nessuna classe.</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>C'è un errore nel caricamento del form<b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Non posso aprire il file del modello del codice "{0}".<p><p>Ragione: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Non posso aprire il file sorgente "{0}".</p><p>Ragione: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Non posso scrivere il file sorgente "{0}".</p><p>Ragione: {1}</p></translation> </message> @@ -16723,47 +16723,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -16778,192 +16778,192 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation>Le directory di lavoro devono essere aggiornate ?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation>Visualizzazione branch corrente</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation>Applica changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Sottocomando Bisect ({0}) non valido.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation>Anteprima changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation>Identificazione directory del progetto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation>Crea il file .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Rimozione di file dal solo repository Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Changegroup Files (*.hg)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation>Le directory di lavoro devono essere aggiornate ?</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation>Visualizzazione branch corrente</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation>Applica changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Sottocomando Bisect ({0}) non valido.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation>Anteprima changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation>Identificazione directory del progetto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation>Crea il file .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Rimozione di file dal solo repository Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Changegroup Files (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -17822,6 +17822,16 @@ <source>Select a recent commit message to use</source> <translation>Seleziona un messaggio di commit recete da usare</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -23859,12 +23869,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Analisi moduli...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation>La direcotry <b>'{0}'</b> non è un pacchetto Python.</translation> </message> @@ -27678,22 +27688,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Analisi moduli...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation>La direcotry <b>'{0}'</b> non è un pacchetto.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation>La direcotry <b>'{0}'</b> non contiene nessun modulo.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation>Il pacchetto <b>'{0}'</b> non contiene nessuna classe.</translation> </message> @@ -36288,7 +36298,7 @@ <translation>Evidenzia tutti</translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> @@ -47019,12 +47029,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>Il moduloe <b>'{0}'</b> non può essere trovato.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>Il modulo <b>'{0}'</b> non contiene nessuna classe.</translation> </message> @@ -54129,24 +54139,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54155,7 +54165,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54172,24 +54182,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54199,7 +54209,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_ru.ts Wed May 09 20:07:29 2012 +0200 @@ -1000,17 +1000,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Разбор модулей...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Приложение>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Другие>></translation> </message> @@ -4109,42 +4109,42 @@ <translation>Фильтровать &по:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Генерация кода</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Невозможно открыть файл с шаблоном кода <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Невозможно открыть файл с исходными текстами <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Невозможно записать файл с исходными текстами <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>ошибка uic</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>При загрузке формы <b>{0}</b> случилась ошибка:</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Создать код для диалога</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Файл <b>'{0}'</b> существует но не содержит ни одного класса.</translation> </message> @@ -16825,32 +16825,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -16865,207 +16865,207 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation>Обновить рабочий каталог?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation>Текущая ветвь</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Неправильная подкоманда ({0}) для Bisect.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation>Предпросмотр группы изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation>Каталог проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Удаление файлов только из репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial файлы изменений (*.hg)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation>Обновить рабочий каталог?</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation>Текущая ветвь</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Неправильная подкоманда ({0}) для Bisect.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation>Предпросмотр группы изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation>Каталог проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Удаление файлов только из репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial файлы изменений (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -17919,6 +17919,16 @@ <source>Select a recent commit message to use</source> <translation>Выберите недавнее сообщение</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -23972,12 +23982,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Разбор модулей...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation>Каталог <b>'{0}'</b> не является пакетом Python.</translation> </message> @@ -27805,22 +27815,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Разбор модулей...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation>Каталог <b>'{0}'</b> не является пакетом.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation>Пакет <b>'{0}'</b> не содержит ни одного модуля.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation>Пакет <b>'{0}'</b> не содержит ни одного класса.</translation> </message> @@ -36403,7 +36413,7 @@ <translation>Подсвечивать всё</translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' не найдено.</translation> </message> @@ -47121,12 +47131,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>Ме могу найти модуль <b>'{0}'</b>.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>Модуль <b>'{0}'</b> не содержит ни одного класса.</translation> </message> @@ -54307,17 +54317,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54328,30 +54338,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54361,7 +54371,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54378,7 +54388,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_tr.ts Wed May 09 20:07:29 2012 +0200 @@ -1002,17 +1002,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>Moduller İnceleniyor...</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Uygulama>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Diğerleri>></translation> </message> @@ -4109,42 +4109,42 @@ <translation>Bunun&la Filtrele:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>Diyalog Kodunu Oluştur</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation><b>{0}</b> dosyası mevcut ama hiçbir sınıf barındırmıyor.</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>uic hatası</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p><b>{0}</b>.</p><p>{1} formlarını yüklerken hata meydana geldi</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>Kod üretici</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Kod şablon dosyası "{0}" açılamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Kaynak dosyası açılamıyor "{0}".</p><p>.Sebep: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Kaynak dosyası "{0}"yazılamıyor.</p><p>Sebep: {1}</p></translation> </message> @@ -16953,47 +16953,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -17008,192 +17008,192 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -18044,6 +18044,16 @@ <source>Select a recent commit message to use</source> <translation>Geçmiş kayıt mesajlarından seç</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -24027,12 +24037,12 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>Moduller İnceleniyor...</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation><b>'{0}'</b> dizini bir Python paketi değil.</translation> </message> @@ -27983,22 +27993,22 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>Moduller İnceleniyor...</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation><b>'{0}'</b> dizini bir paket değil.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation><b>'{0}'</b>paketi hiçbir modül içermiyor.</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation><b>'{0}'</b>paketi hiçbir modül içermiyor.</translation> </message> @@ -36391,7 +36401,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> @@ -46937,12 +46947,12 @@ <context> <name>UMLClassDiagram</name> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation>Modül <b>'{0}'</b> bulunamadı.</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation>Modül<b>'{0}'</b> hiçbir sınıf içermiyor.</translation> </message> @@ -54120,24 +54130,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -54146,7 +54156,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54163,23 +54173,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -54190,7 +54200,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat May 05 19:23:18 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed May 09 20:07:29 2012 +0200 @@ -1068,17 +1068,17 @@ <context> <name>ApplicationDiagram</name> <message> - <location filename="Graphics/ApplicationDiagram.py" line="63"/> + <location filename="Graphics/ApplicationDiagram.py" line="67"/> <source>Parsing modules...</source> <translation>正在分析模块……</translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="183"/> + <location filename="Graphics/ApplicationDiagram.py" line="187"/> <source><<Application>></source> <translation><<Application>></translation> </message> <message> - <location filename="Graphics/ApplicationDiagram.py" line="185"/> + <location filename="Graphics/ApplicationDiagram.py" line="189"/> <source><<Others>></source> <translation><<Others>></translation> </message> @@ -4264,7 +4264,7 @@ <translation>过滤器(&w):</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>Create Dialog Code</source> <translation>创建对话框代码</translation> </message> @@ -4274,7 +4274,7 @@ <translation type="obsolete">文件 <b>%1</b> 存在但不包含任何类。</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source>uic error</source> <translation>uic 错误</translation> </message> @@ -4284,7 +4284,7 @@ <translation type="obsolete"><p>载入窗体 <b>%1</b>出错。</p><p>%2</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source>Code Generation</source> <translation>代码生成</translation> </message> @@ -4309,27 +4309,27 @@ <translation type="obsolete">……</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="101"/> + <location filename="Project/CreateDialogCodeDialog.py" line="107"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="275"/> + <location filename="Project/CreateDialogCodeDialog.py" line="281"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="326"/> + <location filename="Project/CreateDialogCodeDialog.py" line="332"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="359"/> + <location filename="Project/CreateDialogCodeDialog.py" line="365"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="429"/> + <location filename="Project/CreateDialogCodeDialog.py" line="435"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -17986,47 +17986,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18036,192 +18036,192 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <source>Showing current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> - <source>Showing current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19062,6 +19062,16 @@ <source>Select a recent commit message to use</source> <translation type="unfinished">选择使用一个最近提交消息</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/> + <source>Select to amend the last commit (leave message empty to keep it)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/> + <source>Amend the last commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgCopyDialog</name> @@ -25118,7 +25128,7 @@ <context> <name>ImportsDiagram</name> <message> - <location filename="Graphics/ImportsDiagram.py" line="77"/> + <location filename="Graphics/ImportsDiagram.py" line="79"/> <source>Parsing modules...</source> <translation>正在分析模块……</translation> </message> @@ -25128,7 +25138,7 @@ <translation type="obsolete">文件夹 <b>'%1'</b> 不是一个 Python 包。</translation> </message> <message> - <location filename="Graphics/ImportsDiagram.py" line="105"/> + <location filename="Graphics/ImportsDiagram.py" line="108"/> <source>The directory <b>'{0}'</b> is not a Python package.</source> <translation type="unfinished"></translation> </message> @@ -29419,7 +29429,7 @@ <context> <name>PackageDiagram</name> <message> - <location filename="Graphics/PackageDiagram.py" line="79"/> + <location filename="Graphics/PackageDiagram.py" line="81"/> <source>Parsing modules...</source> <translation>正在分析模块……</translation> </message> @@ -29439,17 +29449,17 @@ <translation type="obsolete">程序包 <b>'%1'</b> 不包含任何类。</translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="109"/> + <location filename="Graphics/PackageDiagram.py" line="111"/> <source>The directory <b>'{0}'</b> is not a package.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="117"/> + <location filename="Graphics/PackageDiagram.py" line="119"/> <source>The package <b>'{0}'</b> does not contain any modules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/PackageDiagram.py" line="132"/> + <location filename="Graphics/PackageDiagram.py" line="134"/> <source>The package <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -39217,7 +39227,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/SearchWidget.py" line="163"/> + <location filename="UI/SearchWidget.py" line="165"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -50579,12 +50589,12 @@ <translation type="obsolete">模块 <b>'%1'</b> 不包含任何类。</translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="69"/> + <location filename="Graphics/UMLClassDiagram.py" line="72"/> <source>The module <b>'{0}'</b> could not be found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Graphics/UMLClassDiagram.py" line="130"/> + <location filename="Graphics/UMLClassDiagram.py" line="133"/> <source>The module <b>'{0}'</b> does not contain any classes.</source> <translation type="unfinished"></translation> </message> @@ -58377,30 +58387,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58411,23 +58421,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -58435,7 +58445,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>