Mercurial Repositories > eric / changeset
changeset
Aadded capability to manage the QtHelp filter attributes to the web browser.
Sat, 31 Mar 2012 19:15:17 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 31 Mar 2012 19:15:17 +0200
- changeset 1749
- cfddfc179a2c
- parent 1748
- f6169c7a5f65
- child 1754
- 4e2f87d03546
Aadded capability to manage the QtHelp filter attributes to the web browser.
--- a/APIs/Python3/eric5.api Sat Mar 31 15:22:50 2012 +0200 +++ b/APIs/Python3/eric5.api Sat Mar 31 19:15:17 2012 +0200 @@ -2578,6 +2578,7 @@ eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemChanged?4(item, column) eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_buttonBox_accepted?4() eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_filtersList_currentItemChanged?4(current, previous) +eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_removeAttributeButton_clicked?4() eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_removeButton_clicked?4() eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog?1(engine, parent=None) eric5.Helpviewer.SearchWidget.SearchWidget.findNext?4()
--- a/Documentation/Help/source.qhp Sat Mar 31 15:22:50 2012 +0200 +++ b/Documentation/Help/source.qhp Sat Mar 31 19:15:17 2012 +0200 @@ -8073,10 +8073,12 @@ <keyword name="QtHelpFiltersDialog" id="QtHelpFiltersDialog" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog" /> <keyword name="QtHelpFiltersDialog (Constructor)" id="QtHelpFiltersDialog (Constructor)" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.__init__" /> <keyword name="QtHelpFiltersDialog (Module)" id="QtHelpFiltersDialog (Module)" ref="eric5.Helpviewer.QtHelpFiltersDialog.html" /> + <keyword name="QtHelpFiltersDialog.__removeAttributes" id="QtHelpFiltersDialog.__removeAttributes" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.__removeAttributes" /> <keyword name="QtHelpFiltersDialog.on_addButton_clicked" id="QtHelpFiltersDialog.on_addButton_clicked" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_addButton_clicked" /> <keyword name="QtHelpFiltersDialog.on_attributesList_itemChanged" id="QtHelpFiltersDialog.on_attributesList_itemChanged" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_attributesList_itemChanged" /> <keyword name="QtHelpFiltersDialog.on_buttonBox_accepted" id="QtHelpFiltersDialog.on_buttonBox_accepted" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_buttonBox_accepted" /> <keyword name="QtHelpFiltersDialog.on_filtersList_currentItemChanged" id="QtHelpFiltersDialog.on_filtersList_currentItemChanged" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_filtersList_currentItemChanged" /> + <keyword name="QtHelpFiltersDialog.on_removeAttributeButton_clicked" id="QtHelpFiltersDialog.on_removeAttributeButton_clicked" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_removeAttributeButton_clicked" /> <keyword name="QtHelpFiltersDialog.on_removeButton_clicked" id="QtHelpFiltersDialog.on_removeButton_clicked" ref="eric5.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.on_removeButton_clicked" /> <keyword name="QtHelpGenerator" id="QtHelpGenerator" ref="eric5.DocumentationTools.QtHelpGenerator.html#QtHelpGenerator" /> <keyword name="QtHelpGenerator (Constructor)" id="QtHelpGenerator (Constructor)" ref="eric5.DocumentationTools.QtHelpGenerator.html#QtHelpGenerator.__init__" />
--- a/Documentation/Source/eric5.Helpviewer.QtHelpFiltersDialog.html Sat Mar 31 15:22:50 2012 +0200 +++ b/Documentation/Source/eric5.Helpviewer.QtHelpFiltersDialog.html Sat Mar 31 19:15:17 2012 +0200 @@ -61,6 +61,9 @@ <td><a href="#QtHelpFiltersDialog.__init__">QtHelpFiltersDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpFiltersDialog.__removeAttributes">__removeAttributes</a></td> +<td>Private method to remove attributes from the Qt Help database.</td> +</tr><tr> <td><a href="#QtHelpFiltersDialog.on_addButton_clicked">on_addButton_clicked</a></td> <td>Private slot to add a new filter.</td> </tr><tr> @@ -73,6 +76,9 @@ <td><a href="#QtHelpFiltersDialog.on_filtersList_currentItemChanged">on_filtersList_currentItemChanged</a></td> <td>Private slot to update the attributes depending on the current filter.</td> </tr><tr> +<td><a href="#QtHelpFiltersDialog.on_removeAttributeButton_clicked">on_removeAttributeButton_clicked</a></td> +<td>Private slot to remove a filter attribute.</td> +</tr><tr> <td><a href="#QtHelpFiltersDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove a filter.</td> </tr> @@ -94,7 +100,12 @@ <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="QtHelpFiltersDialog.on_addButton_clicked" ID="QtHelpFiltersDialog.on_addButton_clicked"></a> +</dl><a NAME="QtHelpFiltersDialog.__removeAttributes" ID="QtHelpFiltersDialog.__removeAttributes"></a> +<h4>QtHelpFiltersDialog.__removeAttributes</h4> +<b>__removeAttributes</b>(<i></i>) +<p> + Private method to remove attributes from the Qt Help database. +</p><a NAME="QtHelpFiltersDialog.on_addButton_clicked" ID="QtHelpFiltersDialog.on_addButton_clicked"></a> <h4>QtHelpFiltersDialog.on_addButton_clicked</h4> <b>on_addButton_clicked</b>(<i></i>) <p> @@ -130,7 +141,12 @@ <dd> reference to the previous current item (QListWidgetItem) </dd> -</dl><a NAME="QtHelpFiltersDialog.on_removeButton_clicked" ID="QtHelpFiltersDialog.on_removeButton_clicked"></a> +</dl><a NAME="QtHelpFiltersDialog.on_removeAttributeButton_clicked" ID="QtHelpFiltersDialog.on_removeAttributeButton_clicked"></a> +<h4>QtHelpFiltersDialog.on_removeAttributeButton_clicked</h4> +<b>on_removeAttributeButton_clicked</b>(<i></i>) +<p> + Private slot to remove a filter attribute. +</p><a NAME="QtHelpFiltersDialog.on_removeButton_clicked" ID="QtHelpFiltersDialog.on_removeButton_clicked"></a> <h4>QtHelpFiltersDialog.on_removeButton_clicked</h4> <b>on_removeButton_clicked</b>(<i></i>) <p>
--- a/Helpviewer/QtHelpFiltersDialog.py Sat Mar 31 15:22:50 2012 +0200 +++ b/Helpviewer/QtHelpFiltersDialog.py Sat Mar 31 19:15:17 2012 +0200 @@ -7,6 +7,8 @@ Module implementing a dialog to manage the QtHelp filters. """ +import sqlite3 + from PyQt4.QtCore import pyqtSlot, Qt from PyQt4.QtGui import QDialog, QTreeWidgetItem, QListWidgetItem, QInputDialog, QLineEdit from PyQt4.QtHelp import QHelpEngineCore @@ -41,6 +43,7 @@ self.__removedFilters = [] self.__filterMap = {} self.__filterMapBackup = {} + self.__removedAttributes = [] for filter in help.customFilters(): atts = help.filterAttributes(filter) @@ -131,6 +134,40 @@ self.filtersList.setCurrentRow(0) @pyqtSlot() + def on_removeAttributeButton_clicked(self): + """ + Private slot to remove a filter attribute. + """ + itm = self.attributesList.takeTopLevelItem( + self.attributesList.indexOfTopLevelItem( + self.attributesList.currentItem())) + if itm is None: + return + + attr = itm.text(0) + self.__removedAttributes.append(attr) + for filter in self.__filterMap: + if attr in self.__filterMap[filter]: + self.__filterMap[filter].remove(attr) + + del itm + + def __removeAttributes(self): + """ + Private method to remove attributes from the Qt Help database. + """ + try: + self.__db = sqlite3.connect(self.__engine.collectionFile()) + except sqlite3.DatabaseError: + pass # ignore database errors + + for attr in self.__removedAttributes: + self.__db.execute( + "DELETE FROM FilterAttributeTable WHERE Name = '{0}'".format(attr)) + self.__db.commit() + self.__db.close() + + @pyqtSlot() def on_buttonBox_accepted(self): """ Private slot to update the database, if the dialog is accepted. @@ -161,7 +198,11 @@ self.__engine.removeCustomFilter(filter) for filter in self.__filterMap: self.__engine.addCustomFilter(filter, self.__filterMap[filter]) - + + if self.__removedAttributes: + self.__removeAttributes() + + if filtersChanged or self.__removedAttributes: self.__engine.setupData() self.accept()
--- a/Helpviewer/QtHelpFiltersDialog.ui Sat Mar 31 15:22:50 2012 +0200 +++ b/Helpviewer/QtHelpFiltersDialog.ui Sat Mar 31 19:15:17 2012 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>QtHelpFiltersDialog</class> - <widget class="QDialog" name="QtHelpFiltersDialog" > - <property name="geometry" > + <widget class="QDialog" name="QtHelpFiltersDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,69 +10,82 @@ <height>391</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Manage QtHelp Filters</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" colspan="2" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Filters:</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="0" column="2"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Attributes:</string> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QListWidget" name="filtersList" /> + <item row="1" column="0" colspan="2"> + <widget class="QListWidget" name="filtersList"/> </item> - <item rowspan="2" row="1" column="2" > - <widget class="QTreeWidget" name="attributesList" > - <property name="rootIsDecorated" > + <item row="1" column="2"> + <widget class="QTreeWidget" name="attributesList"> + <property name="rootIsDecorated"> <bool>false</bool> </property> <column> - <property name="text" > + <property name="text"> <string>1</string> </property> </column> </widget> </item> - <item row="2" column="0" > - <widget class="QPushButton" name="addButton" > - <property name="toolTip" > + <item row="2" column="0"> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> <string>Press to add a new filter</string> </property> - <property name="text" > - <string>Add...</string> + <property name="text"> + <string>Add Filter ...</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QPushButton" name="removeButton" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QPushButton" name="removeButton"> + <property name="toolTip"> <string>Press to remove the selected filter</string> </property> - <property name="text" > - <string>Remove</string> + <property name="text"> + <string>Remove Filter</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QPushButton" name="removeAttributeButton"> + <property name="toolTip"> + <string>Press to remove the selected attribute</string> + </property> + <property name="text"> + <string>Remove Attribute</string> </property> </widget> </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -83,6 +97,7 @@ <tabstop>attributesList</tabstop> <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> + <tabstop>removeAttributeButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> @@ -93,11 +108,11 @@ <receiver>QtHelpFiltersDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>320</x> <y>386</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint>
--- a/changelog Sat Mar 31 15:22:50 2012 +0200 +++ b/changelog Sat Mar 31 19:15:17 2012 +0200 @@ -37,6 +37,7 @@ -- added the capability to restore closed tabs -- added a bookmarks importer to get them directly from other browsers files -- extended bookmarks to hold a description and various timestamps + -- added capability to manage the QtHelp filter attributes - Third Party packages -- updated to Pygments 1.5
--- a/i18n/eric5_cs.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_cs.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18267,27 +18267,27 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> @@ -18297,12 +18297,12 @@ <translation type="obsolete"><p>Patch soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -18312,12 +18312,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -19235,104 +19235,104 @@ <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -34433,55 +34433,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>Uspořádat filtry QtNápovědy</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Filtry:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Atributy:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Stisknout pro přidání nového filtru</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Přidat...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Přidat...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Stisknout pro odebrání vybraného filtru</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Odebrat</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Odebrat</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Přidat filtr</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Název filtru:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38551,12 +38571,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -38842,7 +38862,7 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -38852,7 +38872,7 @@ <translation> (binární)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -38962,7 +38982,7 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -38987,7 +39007,7 @@ <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -39174,12 +39194,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Autor</translation> </message> @@ -39319,7 +39339,7 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -39364,7 +39384,7 @@ <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -40871,7 +40891,7 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -40886,7 +40906,7 @@ <translation>Instalovaná verze PySvn by měla být 1.4.0 nebo vyšší.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -41244,7 +41264,7 @@ <translation>ano</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -41329,7 +41349,7 @@ <translation>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -41642,7 +41662,7 @@ <translation>URL repozitáře je prázdný. Zrušeno...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -41652,7 +41672,7 @@ <translation>Instalovaná verze PySvn by měla být 1.4.0 nebo vyšší.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message>
--- a/i18n/eric5_de.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_de.ts Sat Mar 31 19:15:17 2012 +0200 @@ -17780,37 +17780,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> @@ -17820,12 +17820,12 @@ <translation>Patchinhalt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation><Anfang></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation><Ende></translation> </message> @@ -18751,111 +18751,111 @@ <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>Kein Log für '{0}' verfügbar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Zweige: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Marken: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Vorgänger: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Hinzugefügt: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Modifiziert: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Gelöscht: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Hinzugefügt: {0} (kopiert von {1})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation>Lesezeichen: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation>Phase: {0}<br /> @@ -33470,55 +33470,65 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>QtHelp Filter verwalten</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Filter:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Attribute:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Drücken, um einen neuen Filter hinzuzufügen</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> - <source>Add...</source> - <translation>Hinzufügen...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Drücken, um den ausgewählten Filter zu löschen</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> - <source>Remove</source> - <translation>Entfernen</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Filter hinzufügen</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Filtername:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation>Filter hinzufügen ...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation>Filter entfernen</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation>Drücken, um das ausgewählte Attribut zu entfernen</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation>Attribut entfernen</translation> + </message> </context> <context> <name>QtPage</name> @@ -37632,12 +37642,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -37874,7 +37884,7 @@ <context> <name>SvnDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -37953,7 +37963,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -38069,7 +38079,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -38086,7 +38096,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -38257,12 +38267,12 @@ <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Autor</translation> </message> @@ -38402,12 +38412,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -39945,12 +39955,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -40343,7 +40353,7 @@ <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -40378,7 +40388,7 @@ <translation>Rückgängig machen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -40714,12 +40724,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message>
--- a/i18n/eric5_en.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_en.ts Sat Mar 31 19:15:17 2012 +0200 @@ -17678,37 +17678,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -17718,12 +17718,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -18636,102 +18636,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -33191,55 +33191,65 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> - <source>Add...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -37275,12 +37285,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -37560,12 +37570,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -37678,12 +37688,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -37910,12 +37920,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -38070,12 +38080,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -39564,12 +39574,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -39951,12 +39961,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -40316,12 +40326,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_es.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18107,37 +18107,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> @@ -18147,12 +18147,12 @@ <translation>Contenido del Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation><Inicio></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation><Fin></translation> </message> @@ -19079,112 +19079,112 @@ <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Añadido {0} (copiado de {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation>Marcadores: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation>Fase: {0}<br /> @@ -34052,55 +34052,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>Gestionar Filtros de QtHelp</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Filtros:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Atributos:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Pulse para añadir un nuevo filtro</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Añadir...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Añadir...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Pulse para eliminar el filtro seleccionado</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Eliminar</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Eliminar</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Añadir Filtro</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Nombre de Filtro:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38296,12 +38316,12 @@ <translation>Alt+M</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -38590,7 +38610,7 @@ <translation>Alt+M</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> @@ -38600,7 +38620,7 @@ <translation>(binario)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -38709,7 +38729,7 @@ <translation>Alt+M</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> @@ -38734,7 +38754,7 @@ <translation>No hay directorio temporal disponible.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -38942,12 +38962,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Autor</translation> </message> @@ -39102,12 +39122,12 @@ <translation>Error de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -40631,12 +40651,12 @@ <translation>La versión instalada de PySvn debería ser 1.4.0 o superior.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -41004,7 +41024,7 @@ <translation>si</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> @@ -41079,7 +41099,7 @@ <translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -41394,7 +41414,7 @@ <translation>La URL del repositorio esta vacía. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> @@ -41404,7 +41424,7 @@ <translation>La versión instalada de PySvn debería ser 1.4.0 o superior.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message>
--- a/i18n/eric5_fr.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_fr.ts Sat Mar 31 19:15:17 2012 +0200 @@ -19312,37 +19312,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation type="unfinished">Aucune différence.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation type="unfinished">Enregistrer Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -19352,12 +19352,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -20290,102 +20290,102 @@ <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -36522,55 +36522,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation type="unfinished">1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation type="unfinished">Ajouter...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Ajouter...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation type="unfinished">Supprimer</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Supprimer</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -41344,7 +41364,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -41354,7 +41374,7 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41589,7 +41609,7 @@ <context> <name>SvnDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -41673,7 +41693,7 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41811,7 +41831,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -41832,7 +41852,7 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -42114,12 +42134,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Auteur</translation> </message> @@ -42259,7 +42279,7 @@ <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -42309,7 +42329,7 @@ <translation>Arrêt lors de copie/déplacement</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -43869,7 +43889,7 @@ <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -43884,7 +43904,7 @@ <translation>PySvn installé doit être de version 1.4.0 ou supérieur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44267,7 +44287,7 @@ <translation>Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -44332,7 +44352,7 @@ <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44648,7 +44668,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -44663,7 +44683,7 @@ <translation>PySvn installé doit être de version 1.4.0 ou supérieur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_it.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18033,37 +18033,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Non ci sono differenze.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Salva Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>File Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> @@ -18073,12 +18073,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -18991,111 +18991,111 @@ <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>Nessun log disponibile per '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>diff su {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autore: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Data: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Aggiunti: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Modificati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Cancellati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Aggiunti {0} (copiati da {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -33943,55 +33943,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>Gestisci i filtri QtHelp</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Filtri:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Attributi:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Premi per aggiungere un file nuovo</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Aggiungi...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Aggiungi...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Premi per rimuovere il file selezionato</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Rimuovi</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Rimuovi</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Aggiungi filtro</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Nome filtro:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38135,12 +38155,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -38378,7 +38398,7 @@ <context> <name>SvnDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -38443,7 +38463,7 @@ <translation> (binario)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -38568,7 +38588,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -38578,7 +38598,7 @@ <translation>Non c'è la directory temporanea disponibile.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -38761,12 +38781,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Autore</translation> </message> @@ -38906,7 +38926,7 @@ <translation>Errore Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -38951,7 +38971,7 @@ <translation>Ferma su Copy/Move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -40473,7 +40493,7 @@ <translation>Errore Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -40483,7 +40503,7 @@ <translation>La versione di PySvn installata deve essere 1.4.0 o superiore.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -40866,7 +40886,7 @@ <translation>Adatta dimensione colonne</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -40926,7 +40946,7 @@ <translation>Non ci sono file disponibili/selezionati che appartengono ad una changelist.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -41237,7 +41257,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -41247,7 +41267,7 @@ <translation>La versione installata di PySvn deve essere 1.4.0 o superiore.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message>
--- a/i18n/eric5_ru.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_ru.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18130,37 +18130,37 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -18170,12 +18170,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -19094,111 +19094,111 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -34085,55 +34085,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>Управлять фильтрами документации QtHelp</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Фильтры:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Атрибуты:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Добавить новый фильтр</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Добавить...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Добавить...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Удалить подсвеченный фильтр</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Удалить</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Добавить фильтр</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Название фильтра:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38279,12 +38299,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38520,7 +38540,7 @@ <context> <name>SvnDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -38598,7 +38618,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38714,7 +38734,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -38731,7 +38751,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38902,12 +38922,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Автор</translation> </message> @@ -39048,12 +39068,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -40628,12 +40648,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -41026,7 +41046,7 @@ <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -41061,7 +41081,7 @@ <translation>Откатить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -41402,12 +41422,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message>
--- a/i18n/eric5_tr.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_tr.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18255,27 +18255,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Farklılıkları Kaydet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Patch Dosyaları (*.diff)</translation> </message> @@ -18285,12 +18285,12 @@ <translation type="obsolete"><p>Yama dosyası <b>{0}</b> zaten var.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> @@ -18300,12 +18300,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -19223,102 +19223,102 @@ <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>{0}ne farkı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -34242,55 +34242,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>QtHelp Süzgeçlerini Yönet</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Süzgeçler:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Nitelikler:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Yeni bir filtre eklemek için basınız</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Ekle...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Ekle...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Seçilen filtreyi kaldırmak için seçiniz</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Kaldır</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Kaldır</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Süzgeç Ekle</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Süzgeç adı:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38348,12 +38368,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -38637,12 +38657,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -38757,12 +38777,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -38995,12 +39015,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Yazar</translation> </message> @@ -39155,12 +39175,12 @@ <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -40665,12 +40685,12 @@ <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -41053,12 +41073,12 @@ <translation>evet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -41425,12 +41445,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Mar 31 19:15:17 2012 +0200 @@ -19273,37 +19273,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> @@ -19313,12 +19313,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -20251,102 +20251,102 @@ <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -36490,55 +36490,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation type="unfinished">1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation type="unfinished">添加……</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">添加……</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation type="unfinished">移除</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">移除</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -41313,7 +41333,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41323,7 +41343,7 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41615,7 +41635,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41644,7 +41664,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -41757,7 +41777,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -41804,7 +41824,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -42111,12 +42131,12 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>作者</translation> </message> @@ -42271,7 +42291,7 @@ <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -42281,7 +42301,7 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -43843,7 +43863,7 @@ <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -43853,7 +43873,7 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44236,7 +44256,7 @@ <translation>是</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -44301,7 +44321,7 @@ <translation>没有属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -44617,7 +44637,7 @@ <translation>储存库 URL 为空。终止……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -44632,7 +44652,7 @@ <translation>已安装的 PySvn 版本应为 1.4.0 或更高。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message>
