Sat, 11 Jan 2014 20:03:38 +0100
Added support for the categorisation of projects to multi projects and changed the multi project file format.
--- a/APIs/Python3/eric5.api Sat Jan 11 13:53:42 2014 +0100 +++ b/APIs/Python3/eric5.api Sat Jan 11 20:03:38 2014 +0100 @@ -3384,7 +3384,7 @@ eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_fileButton_clicked?4() eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_filenameEdit_textChanged?4(txt) eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_nameEdit_textChanged?4(txt) -eric5.MultiProject.AddProjectDialog.AddProjectDialog?1(parent=None, startdir=None, project=None) +eric5.MultiProject.AddProjectDialog.AddProjectDialog?1(parent=None, startdir=None, project=None, categories=None) eric5.MultiProject.MultiProject.MultiProject.addE5Actions?4(actions) eric5.MultiProject.MultiProject.MultiProject.addProject?4(startdir=None) eric5.MultiProject.MultiProject.MultiProject.changeProjectProperties?4(pro) @@ -3392,6 +3392,7 @@ eric5.MultiProject.MultiProject.MultiProject.closeMultiProject?4() eric5.MultiProject.MultiProject.MultiProject.dirty?7 eric5.MultiProject.MultiProject.MultiProject.getActions?4() +eric5.MultiProject.MultiProject.MultiProject.getCategories?4() eric5.MultiProject.MultiProject.MultiProject.getDependantProjectFiles?4() eric5.MultiProject.MultiProject.MultiProject.getMasterProjectFile?4() eric5.MultiProject.MultiProject.MultiProject.getMenu?4(menuName)
--- a/APIs/Python3/eric5.bas Sat Jan 11 13:53:42 2014 +0100 +++ b/APIs/Python3/eric5.bas Sat Jan 11 20:03:38 2014 +0100 @@ -442,7 +442,7 @@ ModuleModel UMLModel ModuleScope Scope MultiProject QObject -MultiProjectBrowser QListWidget +MultiProjectBrowser QTreeWidget MultiProjectPage ConfigurationPageBase Ui_MultiProjectPage MultiProjectReader XMLStreamReaderBase MultiProjectWriter XMLStreamWriterBase
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DTDs/MultiProject-5.0.dtd Sat Jan 11 20:03:38 2014 +0100 @@ -0,0 +1,21 @@ +<!-- This is the DTD for eric5's multi project file version 5.0 --> + +<!ELEMENT Description (#PCDATA)> + +<!ELEMENT ProjectName (#PCDATA)> +<!ELEMENT ProjectFile (#PCDATA)> +<!ELEMENT ProjectDescription (#PCDATA)> +<!ELEMENT ProjectCategory (#PCDATA)> +<!ELEMENT Project (ProjectName, + ProjectFile, + ProjectDescription, + ProjectCategory)> +<!ATTLIST Project + isMaster CDATA #REQUIRED> + +<!ELEMENT Projects (Project*)> + +<!ELEMENT MultiProject (Description, + Projects)> +<!ATTLIST MultiProject + version CDATA #REQUIRED>
--- a/Documentation/Help/source.qhp Sat Jan 11 13:53:42 2014 +0100 +++ b/Documentation/Help/source.qhp Sat Jan 11 20:03:38 2014 +0100 @@ -7775,6 +7775,7 @@ <keyword name="MultiProject (Package)" id="MultiProject (Package)" ref="index-eric5.MultiProject.html" /> <keyword name="MultiProject.__checkFilesExist" id="MultiProject.__checkFilesExist" ref="eric5.MultiProject.MultiProject.html#MultiProject.__checkFilesExist" /> <keyword name="MultiProject.__clearRecent" id="MultiProject.__clearRecent" ref="eric5.MultiProject.MultiProject.html#MultiProject.__clearRecent" /> + <keyword name="MultiProject.__extractCategories" id="MultiProject.__extractCategories" ref="eric5.MultiProject.MultiProject.html#MultiProject.__extractCategories" /> <keyword name="MultiProject.__initData" id="MultiProject.__initData" ref="eric5.MultiProject.MultiProject.html#MultiProject.__initData" /> <keyword name="MultiProject.__loadRecent" id="MultiProject.__loadRecent" ref="eric5.MultiProject.MultiProject.html#MultiProject.__loadRecent" /> <keyword name="MultiProject.__newMultiProject" id="MultiProject.__newMultiProject" ref="eric5.MultiProject.MultiProject.html#MultiProject.__newMultiProject" /> @@ -7793,6 +7794,7 @@ <keyword name="MultiProject.checkDirty" id="MultiProject.checkDirty" ref="eric5.MultiProject.MultiProject.html#MultiProject.checkDirty" /> <keyword name="MultiProject.closeMultiProject" id="MultiProject.closeMultiProject" ref="eric5.MultiProject.MultiProject.html#MultiProject.closeMultiProject" /> <keyword name="MultiProject.getActions" id="MultiProject.getActions" ref="eric5.MultiProject.MultiProject.html#MultiProject.getActions" /> + <keyword name="MultiProject.getCategories" id="MultiProject.getCategories" ref="eric5.MultiProject.MultiProject.html#MultiProject.getCategories" /> <keyword name="MultiProject.getDependantProjectFiles" id="MultiProject.getDependantProjectFiles" ref="eric5.MultiProject.MultiProject.html#MultiProject.getDependantProjectFiles" /> <keyword name="MultiProject.getMasterProjectFile" id="MultiProject.getMasterProjectFile" ref="eric5.MultiProject.MultiProject.html#MultiProject.getMasterProjectFile" /> <keyword name="MultiProject.getMenu" id="MultiProject.getMenu" ref="eric5.MultiProject.MultiProject.html#MultiProject.getMenu" /> @@ -7821,6 +7823,7 @@ <keyword name="MultiProjectBrowser.__configure" id="MultiProjectBrowser.__configure" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__configure" /> <keyword name="MultiProjectBrowser.__contextMenuRequested" id="MultiProjectBrowser.__contextMenuRequested" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__contextMenuRequested" /> <keyword name="MultiProjectBrowser.__createPopupMenu" id="MultiProjectBrowser.__createPopupMenu" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__createPopupMenu" /> + <keyword name="MultiProjectBrowser.__findCategoryItem" id="MultiProjectBrowser.__findCategoryItem" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__findCategoryItem" /> <keyword name="MultiProjectBrowser.__findProjectItem" id="MultiProjectBrowser.__findProjectItem" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__findProjectItem" /> <keyword name="MultiProjectBrowser.__multiProjectClosed" id="MultiProjectBrowser.__multiProjectClosed" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__multiProjectClosed" /> <keyword name="MultiProjectBrowser.__multiProjectOpened" id="MultiProjectBrowser.__multiProjectOpened" ref="eric5.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__multiProjectOpened" />
--- a/Documentation/Source/eric5.MultiProject.AddProjectDialog.html Sat Jan 11 13:53:42 2014 +0100 +++ b/Documentation/Source/eric5.MultiProject.AddProjectDialog.html Sat Jan 11 20:03:38 2014 +0100 @@ -82,7 +82,7 @@ </table> <a NAME="AddProjectDialog.__init__" ID="AddProjectDialog.__init__"></a> <h4>AddProjectDialog (Constructor)</h4> -<b>AddProjectDialog</b>(<i>parent=None, startdir=None, project=None</i>) +<b>AddProjectDialog</b>(<i>parent=None, startdir=None, project=None, categories=None</i>) <p> Constructor </p><dl> @@ -95,6 +95,9 @@ </dd><dt><i>project</i></dt> <dd> dictionary containing project data +</dd><dt><i>categories</i></dt> +<dd> +list of already used categories (list of string) </dd> </dl><a NAME="AddProjectDialog.__updateUi" ID="AddProjectDialog.__updateUi"></a> <h4>AddProjectDialog.__updateUi</h4> @@ -109,10 +112,10 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple of four values (string, string, boolean, string) giving - the project name, the name of the project file, a flag telling, - whether the project shall be the main project and a short - description for the project +tuple of five values (string, string, boolean, string, string) + giving the project name, the name of the project file, a flag + telling whether the project shall be the main project, a short + description for the project and the project category </dd> </dl><a NAME="AddProjectDialog.on_fileButton_clicked" ID="AddProjectDialog.on_fileButton_clicked"></a> <h4>AddProjectDialog.on_fileButton_clicked</h4>
--- a/Documentation/Source/eric5.MultiProject.MultiProject.html Sat Jan 11 13:53:42 2014 +0100 +++ b/Documentation/Source/eric5.MultiProject.MultiProject.html Sat Jan 11 20:03:38 2014 +0100 @@ -104,6 +104,9 @@ <td><a href="#MultiProject.__clearRecent">__clearRecent</a></td> <td>Private method to clear the recent multi projects menu.</td> </tr><tr> +<td><a href="#MultiProject.__extractCategories">__extractCategories</a></td> +<td>Private slot to extract the categories used in the project definitions.</td> +</tr><tr> <td><a href="#MultiProject.__initData">__initData</a></td> <td>Private method to initialize the multi project data part.</td> </tr><tr> @@ -158,6 +161,9 @@ <td><a href="#MultiProject.getActions">getActions</a></td> <td>Public method to get a list of all actions.</td> </tr><tr> +<td><a href="#MultiProject.getCategories">getCategories</a></td> +<td>Public method to get the list of defined categories.</td> +</tr><tr> <td><a href="#MultiProject.getDependantProjectFiles">getDependantProjectFiles</a></td> <td>Public method to get the filenames of the dependant projects.</td> </tr><tr> @@ -254,6 +260,11 @@ <b>__clearRecent</b>(<i></i>) <p> Private method to clear the recent multi projects menu. +</p><a NAME="MultiProject.__extractCategories" ID="MultiProject.__extractCategories"></a> +<h4>MultiProject.__extractCategories</h4> +<b>__extractCategories</b>(<i></i>) +<p> + Private slot to extract the categories used in the project definitions. </p><a NAME="MultiProject.__initData" ID="MultiProject.__initData"></a> <h4>MultiProject.__initData</h4> <b>__initData</b>(<i></i>) @@ -414,6 +425,16 @@ <dd> list of all actions (list of E5Action) </dd> +</dl><a NAME="MultiProject.getCategories" ID="MultiProject.getCategories"></a> +<h4>MultiProject.getCategories</h4> +<b>getCategories</b>(<i></i>) +<p> + Public method to get the list of defined categories. +</p><dl> +<dt>Returns:</dt> +<dd> +list of categories (list of string) +</dd> </dl><a NAME="MultiProject.getDependantProjectFiles" ID="MultiProject.getDependantProjectFiles"></a> <h4>MultiProject.getDependantProjectFiles</h4> <b>getDependantProjectFiles</b>(<i></i>)
--- a/Documentation/Source/eric5.MultiProject.MultiProjectBrowser.html Sat Jan 11 13:53:42 2014 +0100 +++ b/Documentation/Source/eric5.MultiProject.MultiProjectBrowser.html Sat Jan 11 20:03:38 2014 +0100 @@ -45,7 +45,7 @@ Class implementing the multi project browser. </p> <h3>Derived from</h3> -QListWidget +QTreeWidget <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -75,6 +75,9 @@ <td><a href="#MultiProjectBrowser.__createPopupMenu">__createPopupMenu</a></td> <td>Private method to create the popup menu.</td> </tr><tr> +<td><a href="#MultiProjectBrowser.__findCategoryItem">__findCategoryItem</a></td> +<td>Private method to find the item for a category.</td> +</tr><tr> <td><a href="#MultiProjectBrowser.__findProjectItem">__findProjectItem</a></td> <td>Private method to search a specific project item.</td> </tr><tr> @@ -164,7 +167,23 @@ <b>__createPopupMenu</b>(<i></i>) <p> Private method to create the popup menu. -</p><a NAME="MultiProjectBrowser.__findProjectItem" ID="MultiProjectBrowser.__findProjectItem"></a> +</p><a NAME="MultiProjectBrowser.__findCategoryItem" ID="MultiProjectBrowser.__findCategoryItem"></a> +<h4>MultiProjectBrowser.__findCategoryItem</h4> +<b>__findCategoryItem</b>(<i>category</i>) +<p> + Private method to find the item for a category. +</p><dl> +<dt><i>category</i></dt> +<dd> +category to search for (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the category item or None, if there is + no such item (QTreeWidgetItem or None) +</dd> +</dl><a NAME="MultiProjectBrowser.__findProjectItem" ID="MultiProjectBrowser.__findProjectItem"></a> <h4>MultiProjectBrowser.__findProjectItem</h4> <b>__findProjectItem</b>(<i>project</i>) <p> @@ -177,7 +196,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -row number of the project, -1 if not found (integer) +reference to the item (QTreeWidgetItem) or None </dd> </dl><a NAME="MultiProjectBrowser.__multiProjectClosed" ID="MultiProjectBrowser.__multiProjectClosed"></a> <h4>MultiProjectBrowser.__multiProjectClosed</h4> @@ -202,7 +221,7 @@ </p><dl> <dt><i>itm</i></dt> <dd> -reference to the project item to be opened (QListWidgetItem) +reference to the project item to be opened (QTreeWidgetItem) </dd> </dl><a NAME="MultiProjectBrowser.__projectAdded" ID="MultiProjectBrowser.__projectAdded"></a> <h4>MultiProjectBrowser.__projectAdded</h4> @@ -257,7 +276,7 @@ </p><dl> <dt><i>itm</i></dt> <dd> -reference to the item to be set (QListWidgetItem) +reference to the item to be set (QTreeWidgetItem) </dd><dt><i>project</i></dt> <dd> reference to the project data dictionary
--- a/E5XML/Config.py Sat Jan 11 13:53:42 2014 +0100 +++ b/E5XML/Config.py Sat Jan 11 20:03:38 2014 +0100 @@ -8,7 +8,7 @@ """ # version number of the multi project file -multiProjectFileFormatVersion = "4.2" +multiProjectFileFormatVersion = "5.0" # version number of the project file projectFileFormatVersion = "5.1"
--- a/E5XML/MultiProjectReader.py Sat Jan 11 13:53:42 2014 +0100 +++ b/E5XML/MultiProjectReader.py Sat Jan 11 20:03:38 2014 +0100 @@ -17,7 +17,7 @@ """ Class for reading an XML multi project file. """ - supportedVersions = ["4.2"] + supportedVersions = ["4.2", "5.0"] def __init__(self, device, multiProject): """ @@ -61,7 +61,7 @@ """ while not self.atEnd(): self.readNext() - if self.isEndElement() and self.name() == "Task": + if self.isEndElement() and self.name() == "Projects": break if self.isStartElement(): @@ -81,6 +81,9 @@ while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Project": + if 'category' not in project: + # upgrade from 4.2 format + project["category"] = "" self.multiProject.projects.append(project) break @@ -92,5 +95,7 @@ self.readElementText()) elif self.name() == "ProjectDescription": project["description"] = self.readElementText() + elif self.name() == "ProjectCategory": + project["category"] = self.readElementText() else: self.raiseUnexpectedStartTag(self.name())
--- a/E5XML/MultiProjectWriter.py Sat Jan 11 13:53:42 2014 +0100 +++ b/E5XML/MultiProjectWriter.py Sat Jan 11 20:03:38 2014 +0100 @@ -68,6 +68,7 @@ "ProjectFile", Utilities.fromNativeSeparators(project['file'])) self.writeTextElement("ProjectDescription", project['description']) + self.writeTextElement("ProjectCategory", project['category']) self.writeEndElement() self.writeEndElement()
--- a/MultiProject/AddProjectDialog.py Sat Jan 11 13:53:42 2014 +0100 +++ b/MultiProject/AddProjectDialog.py Sat Jan 11 20:03:38 2014 +0100 @@ -23,13 +23,15 @@ """ Class implementing the add project dialog. """ - def __init__(self, parent=None, startdir=None, project=None): + def __init__(self, parent=None, startdir=None, project=None, + categories=None): """ Constructor @param parent parent widget of this dialog (QWidget) @param startdir start directory for the selection dialog (string) @param project dictionary containing project data + @param categories list of already used categories (list of string) """ super().__init__(parent) self.setupUi(self) @@ -38,6 +40,10 @@ self.fileCompleter = E5FileCompleter(self.filenameEdit) + if categories: + self.categoryComboBox.addItem("") + self.categoryComboBox.addItems(sorted(categories)) + self.startdir = startdir self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) @@ -53,6 +59,10 @@ self.filenameEdit.setText(project['file']) self.descriptionEdit.setPlainText(project['description']) self.masterCheckBox.setChecked(project['master']) + index = self.categoryComboBox.findText(project['category']) + if index == -1: + index = 0 + self.categoryComboBox.setCurrentIndex(index) @pyqtSlot() def on_fileButton_clicked(self): @@ -76,14 +86,16 @@ """ Public slot to retrieve the dialogs data. - @return tuple of four values (string, string, boolean, string) giving - the project name, the name of the project file, a flag telling, - whether the project shall be the main project and a short - description for the project + @return tuple of five values (string, string, boolean, string, string) + giving the project name, the name of the project file, a flag + telling whether the project shall be the main project, a short + description for the project and the project category """ - return (self.nameEdit.text(), self.filenameEdit.text(), + return (self.nameEdit.text(), + self.filenameEdit.text(), self.masterCheckBox.isChecked(), - self.descriptionEdit.toPlainText()) + self.descriptionEdit.toPlainText(), + self.categoryComboBox.currentText()) @pyqtSlot(str) def on_nameEdit_textChanged(self, txt):
--- a/MultiProject/AddProjectDialog.ui Sat Jan 11 13:53:42 2014 +0100 +++ b/MultiProject/AddProjectDialog.ui Sat Jan 11 20:03:38 2014 +0100 @@ -16,89 +16,105 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout"> - <item> - <layout class="QGridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>&Name:</string> - </property> - <property name="buddy"> - <cstring>nameEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="1" colspan="2"> - <widget class="QLineEdit" name="nameEdit"> - <property name="toolTip"> - <string>Enter the name of the project</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Project&file:</string> - </property> - <property name="buddy"> - <cstring>filenameEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="filenameEdit"> - <property name="toolTip"> - <string>Enter the name of the project file</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>&Description:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="buddy"> - <cstring>descriptionEdit</cstring> - </property> - </widget> - </item> - <item row="2" column="1" colspan="2"> - <widget class="QTextEdit" name="descriptionEdit"> - <property name="toolTip"> - <string>Enter a short description for the project</string> - </property> - <property name="tabChangesFocus"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="3"> - <widget class="QCheckBox" name="masterCheckBox"> - <property name="toolTip"> - <string>Select to make this project the main project</string> - </property> - <property name="text"> - <string>Is &main project</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QToolButton" name="fileButton"> - <property name="toolTip"> - <string>Select the project file via a file selection dialog</string> - </property> - </widget> - </item> - </layout> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Name:</string> + </property> + <property name="buddy"> + <cstring>nameEdit</cstring> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter the name of the project</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Project&file:</string> + </property> + <property name="buddy"> + <cstring>filenameEdit</cstring> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="filenameEdit"> + <property name="toolTip"> + <string>Enter the name of the project file</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="fileButton"> + <property name="toolTip"> + <string>Select the project file via a file selection dialog</string> + </property> + </widget> </item> - <item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>&Description:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="buddy"> + <cstring>descriptionEdit</cstring> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QTextEdit" name="descriptionEdit"> + <property name="toolTip"> + <string>Enter a short description for the project</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>&Category:</string> + </property> + <property name="buddy"> + <cstring>categoryComboBox</cstring> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="categoryComboBox"> + <property name="toolTip"> + <string>Select a project category</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="3"> + <widget class="QCheckBox" name="masterCheckBox"> + <property name="toolTip"> + <string>Select to make this project the main project</string> + </property> + <property name="text"> + <string>Is &main project</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="3"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -115,6 +131,7 @@ <tabstop>filenameEdit</tabstop> <tabstop>fileButton</tabstop> <tabstop>descriptionEdit</tabstop> + <tabstop>categoryComboBox</tabstop> <tabstop>masterCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops>
--- a/MultiProject/MultiProject.py Sat Jan 11 13:53:42 2014 +0100 +++ b/MultiProject/MultiProject.py Sat Jan 11 20:03:38 2014 +0100 @@ -89,11 +89,13 @@ self.opened = False self.projects = [] # list of project info; each info entry is # a dictionary - # 'name' : Name of the project - # 'file' : project filename + # 'name' : name of the project + # 'file' : project file name # 'master' : flag indicating the master # project # 'description' : description of the project + # 'category' : name of the group + self.categories = [] def __loadRecent(self): """ @@ -188,6 +190,23 @@ self.projects.remove(project) self.setDirty(True) + def __extractCategories(self): + """ + Private slot to extract the categories used in the project definitions. + """ + for project in self.projects: + if project['category'] and \ + project['category'] not in self.categories: + self.categories.append(project['category']) + + def getCategories(self): + """ + Public method to get the list of defined categories. + + @return list of categories (list of string) + """ + return [c for c in self.categories if c] + def __readMultiProject(self, fn): """ Private method to read in a multi project (.e4m) file. @@ -216,6 +235,8 @@ self.pfile = os.path.abspath(fn) self.ppath = os.path.abspath(os.path.dirname(fn)) + self.__extractCategories() + # insert filename into list of recently opened multi projects self.__syncRecent() @@ -278,9 +299,10 @@ startdir = self.ppath if not startdir: startdir = Preferences.getMultiProject("Workspace") - dlg = AddProjectDialog(self.ui, startdir=startdir) + dlg = AddProjectDialog(self.ui, startdir=startdir, + categories=self.categories) if dlg.exec_() == QDialog.Accepted: - name, filename, isMaster, description = dlg.getData() + name, filename, isMaster, description, category = dlg.getData() # step 1: check, if project was already added for project in self.projects: @@ -302,8 +324,11 @@ 'file': filename, 'master': isMaster, 'description': description, + 'category': category, } self.projects.append(project) + if category not in self.categories: + self.categories.append(category) self.projectAdded.emit(project) self.setDirty(True) @@ -326,10 +351,13 @@ # step 2: change the entry for project in self.projects: if project['file'] == pro['file']: - # project filename is not changeable via interface + # project file name is not changeable via interface project['name'] = pro['name'] project['master'] = pro['master'] project['description'] = pro['description'] + project['category'] = pro['category'] + if project['category'] not in self.categories: + self.categories.append(project['category']) self.projectDataChanged.emit(project) self.setDirty(True) @@ -420,7 +448,7 @@ self.tr("Open multiproject"), Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(), - self.tr("Multiproject Files (*.e4m)")) + self.tr("Multiproject Files (*.e5m *.e4m)")) if fn == "": fn = None @@ -457,6 +485,9 @@ """ if self.isDirty(): if len(self.pfile) > 0: + if self.pfile.endswith(".e4m"): + self.pfile = self.pfile.replace(".e4m", ".e5m") + self.__syncRecent() ok = self.__writeMultiProject() else: ok = self.saveMultiProjectAs() @@ -470,7 +501,7 @@ @return flag indicating success (boolean) """ - defaultFilter = self.tr("Multiproject Files (*.e4m)") + defaultFilter = self.tr("Multiproject Files (*.e5m)") if self.ppath: defaultPath = self.ppath else: @@ -480,7 +511,7 @@ self.parent(), self.tr("Save multiproject as"), defaultPath, - self.tr("Multiproject Files (*.e4m)"), + self.tr("Multiproject Files (*.e5m)"), defaultFilter, E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
--- a/MultiProject/MultiProjectBrowser.py Sat Jan 11 13:53:42 2014 +0100 +++ b/MultiProject/MultiProjectBrowser.py Sat Jan 11 20:03:38 2014 +0100 @@ -8,14 +8,14 @@ """ from PyQt4.QtCore import Qt -from PyQt4.QtGui import QListWidget, QListWidgetItem, QDialog, QMenu +from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QDialog, QMenu from E5Gui.E5Application import e5App import UI.PixmapCache -class MultiProjectBrowser(QListWidget): +class MultiProjectBrowser(QTreeWidget): """ Class implementing the multi project browser. """ @@ -31,6 +31,10 @@ self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) self.setAlternatingRowColors(True) + self.setHeaderHidden(True) + self.setItemsExpandable(False) + self.setRootIsDecorated(False) + self.setSortingEnabled(True) self.__openingProject = False @@ -71,7 +75,7 @@ for project in self.multiProject.getProjects(): self.__addProject(project) - self.sortItems() + self.sortItems(0, Qt.AscendingOrder) def __multiProjectClosed(self): """ @@ -86,7 +90,7 @@ @param project reference to the project data dictionary """ self.__addProject(project) - self.sortItems() + self.sortItems(0, Qt.AscendingOrder) def __projectRemoved(self, project): """ @@ -94,10 +98,14 @@ @param project reference to the project data dictionary """ - row = self.__findProjectItem(project) - if row > -1: - itm = self.takeItem(row) + itm = self.__findProjectItem(project) + if itm: + parent = itm.parent() + parent.removeChild(itm) del itm + if parent.childCount() == 0: + top = self.takeTopLevelItem(self.indexOfTopLevelItem(parent)) + del top def __projectDataChanged(self, project): """ @@ -105,11 +113,16 @@ @param project reference to the project data dictionary """ - row = self.__findProjectItem(project) - if row > -1: - self.__setItemData(self.item(row), project) + itm = self.__findProjectItem(project) + if itm: + parent = itm.parent() + if parent.text(0) != project["category"]: + self.__projectRemoved(project) + self.__addProject(project) + else: + self.__setItemData(itm, project) - self.sortItems() + self.sortItems(0, Qt.AscendingOrder) def __projectOpened(self, projectfile): """ @@ -122,10 +135,11 @@ 'file': projectfile, 'master': False, 'description': "", + 'category': "", } - row = self.__findProjectItem(project) - if row > -1: - self.item(row).setSelected(True) + itm = self.__findProjectItem(project) + if itm: + itm.setSelected(True) def __contextMenuRequested(self, coord): """ @@ -134,7 +148,7 @@ @param coord the position of the mouse pointer (QPoint) """ itm = self.itemAt(coord) - if itm is None: + if itm is None or itm.parent() is None: self.__backMenu.popup(self.mapToGlobal(coord)) else: self.__menu.popup(self.mapToGlobal(coord)) @@ -143,15 +157,15 @@ """ Private slot to open a project. - @param itm reference to the project item to be opened (QListWidgetItem) + @param itm reference to the project item to be opened (QTreeWidgetItem) """ if itm is None: itm = self.currentItem() - if itm is None: + if itm is None or itm.parent() is None: return if not self.__openingProject: - filename = itm.data(Qt.UserRole) + filename = itm.data(0, Qt.UserRole) if filename: self.__openingProject = True self.multiProject.openProject(filename) @@ -161,54 +175,78 @@ ## Private methods below ########################################################################### + def __findCategoryItem(self, category): + """ + Private method to find the item for a category. + + @param category category to search for (string) + @return reference to the category item or None, if there is + no such item (QTreeWidgetItem or None) + """ + if category == "": + category = self.tr("Not categorized") + for index in range(self.topLevelItemCount()): + itm = self.topLevelItem(index) + if itm.text(0) == category: + return itm + + return None + def __addProject(self, project): """ Private method to add a project to the list. @param project reference to the project data dictionary """ - itm = QListWidgetItem(self) + parent = self.__findCategoryItem(project['category']) + if parent is None: + if project['category']: + parent = QTreeWidgetItem(self, [project['category']]) + else: + parent = QTreeWidgetItem(self, [self.tr("Not categorized")]) + parent.setExpanded(True) + itm = QTreeWidgetItem(parent) self.__setItemData(itm, project) def __setItemData(self, itm, project): """ Private method to set the data of a project item. - @param itm reference to the item to be set (QListWidgetItem) + @param itm reference to the item to be set (QTreeWidgetItem) @param project reference to the project data dictionary """ - itm.setText(project['name']) + itm.setText(0, project['name']) if project['master']: - itm.setIcon(UI.PixmapCache.getIcon("masterProject.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("masterProject.png")) else: - itm.setIcon(UI.PixmapCache.getIcon("empty.png")) - itm.setToolTip(project['file']) - itm.setData(Qt.UserRole, project['file']) + itm.setIcon(0, UI.PixmapCache.getIcon("empty.png")) + itm.setToolTip(0, project['file']) + itm.setData(0, Qt.UserRole, project['file']) def __findProjectItem(self, project): """ Private method to search a specific project item. @param project reference to the project data dictionary - @return row number of the project, -1 if not found (integer) + @return reference to the item (QTreeWidgetItem) or None """ - row = 0 - while row < self.count(): - itm = self.item(row) - data = itm.data(Qt.UserRole) - if data == project['file']: - return row - row += 1 + for topIndex in range(self.topLevelItemCount()): + topItm = self.topLevelItem(topIndex) + for childIndex in range(topItm.childCount()): + itm = topItm.child(childIndex) + data = itm.data(0, Qt.UserRole) + if data == project['file']: + return itm - return -1 + return None def __removeProject(self): """ Private method to handle the Remove context menu entry. """ itm = self.currentItem() - if itm is not None: - filename = itm.data(Qt.UserRole) + if itm is not None and itm.parent() is not None: + filename = itm.data(0, Qt.UserRole) if filename: self.multiProject.removeProject(filename) @@ -217,20 +255,24 @@ Private method to show the data of a project entry. """ itm = self.currentItem() - if itm is not None: - filename = itm.data(Qt.UserRole) + if itm is not None and itm.parent() is not None: + filename = itm.data(0, Qt.UserRole) if filename: project = self.multiProject.getProject(filename) if project is not None: from .AddProjectDialog import AddProjectDialog - dlg = AddProjectDialog(self, project=project) + dlg = AddProjectDialog( + self, project=project, + categories=self.multiProject.getCategories()) if dlg.exec_() == QDialog.Accepted: - name, filename, isMaster, description = dlg.getData() + name, filename, isMaster, description, category = \ + dlg.getData() project = { 'name': name, 'file': filename, 'master': isMaster, 'description': description, + 'category': category, } self.multiProject.changeProjectProperties(project)
--- a/changelog Sat Jan 11 13:53:42 2014 +0100 +++ b/changelog Sat Jan 11 20:03:38 2014 +0100 @@ -2,6 +2,9 @@ ---------- Version 5.5.0-xxx: - bug fixes +- Multi Project + -- added support for the categorisation of projects and changed the + multi project file format - Version Control System Interfaces -- Mercurial --- enhanced the tag dialog and extended the log browser to allow
--- a/i18n/eric5_cs.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_cs.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1122,32 +1122,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>Jmé&no:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Zadejte jméno projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>Sou&bor projektu:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Zadejte název souboru projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Výběr projektu přes dialogové okno výběru souboru</translation> </message> @@ -1157,7 +1157,7 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Zadejte krátký popis projektu</translation> </message> @@ -1177,30 +1177,40 @@ <translation type="obsolete">Soubory projektu (*.e4p *.e4pz)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Popis:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -15296,17 +15306,17 @@ <translation>Text</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Hledat</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Výběr adresáře</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation></translation> </message> @@ -15361,7 +15371,7 @@ <translation>Nahradit</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Nahradit v souborech</translation> </message> @@ -15386,37 +15396,37 @@ <translation>Pocit jako</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Kopírovat cestu do schránky</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Neplatný výraz hledání</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Výraz hledná není platný. </p><p>Chyba: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze číst ze souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -15519,22 +15529,22 @@ <translation>Cesta</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Stop</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Stisknout pro ukončení hledání</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Otevřít vybraný soubor</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Vybrat hledaný adresář</translation> </message> @@ -16940,17 +16950,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished">Systém</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished">Vybrat soubor s CSS styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Všechny soubory (*)</translation> </message> @@ -17258,22 +17268,22 @@ <translation type="obsolete">Web prohlížeč</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Vybrat obvyklý prohlížeč</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Vybrat web prohlížeč</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Vybrat PDF prohlížeč</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Vybrat CHM prohlížeč</translation> </message> @@ -20252,12 +20262,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <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> @@ -32752,67 +32762,67 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> + <location filename="../MultiProject/MultiProject.py" line="632"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> + <location filename="../MultiProject/MultiProject.py" line="645"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save &as...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="671"/> <source>Add &project...</source> <translation>Přidat &projekt...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="686"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Otevřít poslední multip&rojekty</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Načíst soubor multiprojektu</translation> </message> @@ -32822,12 +32832,12 @@ <translation type="obsolete">Komprimované multiprojektové soubory nejsou podporovány. Kompresní knihovna chybí.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Uložit soubor multiprojektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Otevřít multiprojekt</translation> </message> @@ -32844,10 +32854,10 @@ <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Soubory multiprojektu (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Soubory multiprojektu (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Uložit multiprojekt jako</translation> </message> @@ -32857,112 +32867,112 @@ <translation type="obsolete">Soubory multiprojektu (*.e4m);;Komprimované soubory multiprojektu (*.e4mz)</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Zavřít multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Aktuální multiprojekt obsahuje neuložené změny.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Nový multiprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Vygenerovat nový multiprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém multiprojektu.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Otevřít existující multiprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Otevřít....</b><p>Otevře existující multiprojekt.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Zavřít multiprojekt</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>New multiproject</source> + <translation>Nový multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Vygenerovat nový multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém multiprojektu.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Otevřít existující multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Otevřít....</b><p>Otevře existující multiprojekt.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Zavřít multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> <source>Close the current multiproject</source> <translation>Uzavře aktuální multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> + <location filename="../MultiProject/MultiProject.py" line="638"/> <source><b>Close</b><p>This closes the current multiproject.</p></source> <translation><b>Zavřít</b><p>Aktuální multiprojekt se uzavře.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Uložit multiprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Uložit aktuální multiprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Uložit</b><p>Aktuální multiprojekt se uloží.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Uloží aktuální multiprojekt do nového souboru</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Uložit jako</b><p>Uloží aktuální mulktiprojekt do nového souboru.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Přidat projekt do multiprojektu</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Projekt se přidá do aktuálního multiprojektu</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Přidat projekt...</b><p>Otevře dialog pro přidání projektu do aktuálního multiprojektu.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Nastavení multiprojektu</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Zobrazit nastavení projektu</translation> + <source>Save multiproject</source> + <translation>Uložit multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Uložit aktuální multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Uložit</b><p>Aktuální multiprojekt se uloží.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Uloží aktuální multiprojekt do nového souboru</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Uložit jako</b><p>Uloží aktuální mulktiprojekt do nového souboru.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Přidat projekt do multiprojektu</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Projekt se přidá do aktuálního multiprojektu</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Přidat projekt...</b><p>Otevře dialog pro přidání projektu do aktuálního multiprojektu.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Nastavení multiprojektu</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Zobrazit nastavení projektu</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení multiprojektu.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor multiprojektu <b>{0}</b> nelze načíst.</p></translation> </message> @@ -32977,7 +32987,7 @@ <translation type="obsolete"><p>Soubor multiprojektu <b>{0}</b> má neplatný obsah.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru multiprojektu <b>{0}</b> nelze zapisovat.</p></translation> </message> @@ -32987,38 +32997,53 @@ <translation type="obsolete"><p>Soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Soubory multiprojektu (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Nastavení</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -35484,17 +35509,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit zveřejnění.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> @@ -35831,17 +35856,17 @@ <translation>(nezkonfigurováno)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(nevykonavatelný)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(nenalezeno)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(neznámý)</translation> </message> @@ -47992,12 +48017,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <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> @@ -48156,7 +48181,7 @@ <translation>projekt adresář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Pracovní adresář</translation> </message> @@ -49208,7 +49233,7 @@ <translation>Prot&otokol:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -49250,12 +49275,12 @@ <translation>&Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Vyberte adresář repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Vyberte adresář projektu</translation> </message> @@ -49280,7 +49305,7 @@ <translation><b>URL<b><p>Zadejte URL modulu. Repozitář ve standardním uspořádání musí obsahovat trunk, tags nebo branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation type="unfinished"></translation> </message> @@ -55187,87 +55212,87 @@ <translation>Spustit&elný soubor:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>žádné přesměrování</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>zobrazit výstup</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>vložit do aktuálního editoru</translation> + <source>show output</source> + <translation>zobrazit výstup</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>vložit do aktuálního editoru</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>nahradit výběr aktuálního editoru</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Přidat záznam o nástroji</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Pro přidání menu nástrojů musíte nejdříve nastavit spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Pro přidání vybraného programu do menu nástrojů musíte nejdříve vložit text položky menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Vybraný soubor nebyl nalezen nebo není spustitelný. Prosím, vyberte spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Změnit položku nástroje</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Pro změnu položky menu nástrojů musíte nejdříve nastavit spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Pro přidání vybraného programu do menu nástrojů musíte nejdříve vložit text položky menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Vybraný soubor nebyl nalezen nebo není spustitelný. Prosím, vyberte spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Vybrat spustitelný soubor</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Vybraný soubor není spustitelný. Prosím, vyberte spustitelný soubor.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Vybrat soubor ikony</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Soubory ikon (*.png)</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Text položky menu {0} již existuje.</translation> </message>
--- a/i18n/eric5_de.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_de.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1073,65 +1073,75 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Projekt hinzufügen</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Name:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Gib den Namen des Projektes ein</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>Projekt&datei:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Gib den Namen der Projektdatei ein</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Wähle die Projektdatei mittels eines Dateiauswahldialoges</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Gib eine Kurzbeschreibung des Projektes ein</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Beschreibung:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Projekteigenschaften</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Projektdateien (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation>Auswählen, um dieses Projekt zum Hauptprojekt zu erklären</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation>Ist &Hauptprojekt</translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation>&Kategorie:</translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation>Wähle eine Projektkategorie</translation> + </message> </context> <context> <name>ApplicationDiagramBuilder</name> @@ -14557,7 +14567,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Wähle ein Verzeichnis</translation> </message> @@ -14687,12 +14697,12 @@ <translation>Text</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Anhalten</translation> </message> @@ -14747,17 +14757,17 @@ <translation>Ersetzen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Ersetzen in Dateien</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> @@ -14782,27 +14792,27 @@ <translation>Ersttreffer öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Ungültiger Suchausdruck</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Der Suchausdruck ist nicht gültig.</p><p>Fehler: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Der aktuelle und der originale Hash-Wert der Datei <b>{0}</b> sind unterschiedlich. Überspringe sie.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -14900,22 +14910,22 @@ <translation>Pfad</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Öffnet die ausgewählte Datei</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Drücken, um die Suche anzuhalten</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Wähle das Suchverzeichnis</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Anhalten</translation> </message> @@ -16259,17 +16269,17 @@ <translation>Wähle die Stildatei mittels eines Dateiauswahldialoges</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation>Wähle ein Qt Style Sheet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Alle Dateien (*)</translation> </message> @@ -16553,22 +16563,22 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Wähle anderen Betrachter</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Wähle Webbrowser</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Wähle PDF-Viewer</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Wähle CHM-Viewer</translation> </message> @@ -19401,12 +19411,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <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> @@ -31243,238 +31253,248 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Datei sichern</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>&New...</source> <translation>&Neu...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>&Open...</source> <translation>&Öffnen...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> + <location filename="../MultiProject/MultiProject.py" line="632"/> <source>&Close</source> <translation>Schl&ießen</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> + <location filename="../MultiProject/MultiProject.py" line="645"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save &as...</source> <translation>Speichern &unter...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="671"/> <source>Add &project...</source> <translation>&Projekt hinzufügen...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="686"/> <source>&Properties...</source> <translation>&Eigenschaften...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Mehrfachprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Zu&letzt geöffnete Mehrfachprojekte</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Mehrfachprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>&Löschen</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Mehrfachprojektdatei lesen</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Die Mehrfachprojektdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Mehrfachprojektdatei speichern</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Die Mehrfachprojektdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Mehrfachprojekt öffnen</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="480"/> - <source>Multiproject Files (*.e4m)</source> - <translation>Mehrfachprojekt-Dateien (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Mehrfachprojekt speichern unter</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Mehrfachprojekt schließen</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Das aktuelle Mehrfachprojekt hat ungesicherte Änderungen.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Neues Mehrfachprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Erstelle ein neues Mehrfachprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Neu...</b><p>Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Mehrfachprojektes.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Öffnet ein bestehendes Mehrfachprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Öffnen...</b><p>Dies öffnet ein bestehendes Mehrfachprojekt.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Mehrfachprojekt schließen</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>New multiproject</source> + <translation>Neues Mehrfachprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Erstelle ein neues Mehrfachprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Neu...</b><p>Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Mehrfachprojektes.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Öffnet ein bestehendes Mehrfachprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Öffnen...</b><p>Dies öffnet ein bestehendes Mehrfachprojekt.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Mehrfachprojekt schließen</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> <source>Close the current multiproject</source> <translation>Schließt das aktuelle Mehrfachprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> + <location filename="../MultiProject/MultiProject.py" line="638"/> <source><b>Close</b><p>This closes the current multiproject.</p></source> <translation><b>Schließen</b><p>Dies schließt das aktuelle Mehrfachprojekt.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Mehrfachprojekt speichern</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Speichert das aktuelle Mehrfachprojekt</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Speichern</b><p>Dies speichert das aktuelle Mehrfachprojekt.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Speichert das aktuelle Mehrfachprojekt in eine neue Datei</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Speichern unter</b><p>Dies speichert das aktuelle Mehrfachprojekt in eine neue Datei.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Projekt zum Mehrfachprojekt hinzufügen</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Ein Projekt zum aktuellen Mehrfachprojekt hinzufügen</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Projekt hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem ein Projekt zum aktuellen Mehrfachprojekt hinzugefügt werden kann.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Mehrfachprojekteigenschaften</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Zeigt die Mehrfachprojekt-Eigenschaften an</translation> + <source>Save multiproject</source> + <translation>Mehrfachprojekt speichern</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Speichert das aktuelle Mehrfachprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Speichern</b><p>Dies speichert das aktuelle Mehrfachprojekt.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Speichert das aktuelle Mehrfachprojekt in eine neue Datei</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Speichern unter</b><p>Dies speichert das aktuelle Mehrfachprojekt in eine neue Datei.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Projekt zum Mehrfachprojekt hinzufügen</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Ein Projekt zum aktuellen Mehrfachprojekt hinzufügen</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Projekt hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem ein Projekt zum aktuellen Mehrfachprojekt hinzugefügt werden kann.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Mehrfachprojekteigenschaften</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Zeigt die Mehrfachprojekt-Eigenschaften an</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Eigenschaften...</b><p>Dies zeigt einen Dialog an, mit dem die Mehrfachprojekt-Eigenschaften bearbeitet werden können.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation>Mehrfachprojekt-Dateien (*.e5m *.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation>Mehrfachprojekt-Dateien (*.e5m)</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation>Projekt hinzufügen...</translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation>Nicht kategorisiert</translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -33722,17 +33742,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der Prozess konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>OK</translation> </message> @@ -34044,12 +34064,12 @@ <translation>(nicht konfiguriert)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(nicht ausführbar)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(nicht gefunden)</translation> </message> @@ -34059,7 +34079,7 @@ <translation>Externe Programme</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(unbekannt)</translation> </message> @@ -45790,12 +45810,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <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> @@ -45895,7 +45915,7 @@ <context> <name>SvnCommandDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Arbeitsverzeichnis</translation> </message> @@ -46954,12 +46974,12 @@ <context> <name>SvnNewProjectOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Wähle Repositoryverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Wähle Projektverzeichnis</translation> </message> @@ -47000,7 +47020,7 @@ <translation>&Protokoll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -47059,7 +47079,7 @@ <translation><b>URL</b><p>Gib die URL des Moduls ein. Für ein Repository mit Standardstruktur darf diese nicht den trunk-, tags- oder branches-Anteil enthalten.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation>&Pfad:</translation> </message> @@ -52303,52 +52323,52 @@ <context> <name>ToolConfigurationDialog</name> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Werkzeuge Eintrag hinzufügen</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Sie müssen eine ausführbare Datei angeben, um einen Eintrag zum Werkzeugemenü hinzuzufügen.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Sie müssen einen Menütext angeben, um einen Eintrag zum Werkzeuge Menü hinzuzufügen.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Die gewählte Datei ist nicht ausführbar. Bitte wählen Sie einen ausführbaren Dateinamen.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Wähle ausführbare Datei</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Die ausgewählte Datei konnte nicht gefunden werden oder ist nicht ausführbar. Bitte wählen Sie eine ausführbare Datei.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Werkzeugeintrag ändern</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Sie müssen eine ausführbare Datei angeben, um einen Eintrag des Werkzeugemenüs zu ändern.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Sie müssen einen Menütext angeben, um einen Eintrag des Werkzeuge Menüs zu ändern.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Die ausgewählte Datei konnte nicht gefunden werden oder ist nicht ausführbar. Bitte wählen Sie eine vorhandenen, ausführbare Datei.</translation> </message> @@ -52607,37 +52627,37 @@ <translation>Ausführbare &Datei:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>keine Umleitung</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>Ausgabe anzeigen</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>in aktuellen Editor einfügen</translation> + <source>show output</source> + <translation>Ausgabe anzeigen</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>in aktuellen Editor einfügen</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>Auswahl des aktuellen Editors ersetzen</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Ein Eintrag für den Menütext {0} existiert bereits.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Wähle Symboldatei aus</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Symboldateien (*.png)</translation> </message>
--- a/i18n/eric5_en.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_en.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1053,65 +1053,75 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagramBuilder</name> @@ -14656,57 +14666,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -14804,22 +14814,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation type="unfinished"></translation> </message> @@ -16159,17 +16169,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> @@ -16468,22 +16478,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation type="unfinished"></translation> </message> @@ -19297,12 +19307,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -31087,238 +31097,248 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="480"/> - <source>Multiproject Files (*.e4m)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>New multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>&New...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> - <source>&Open...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>&Save</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> + <source>&New...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> - <source>Save &as...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add &project...</source> + <source>&Open...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close the current multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="638"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="645"/> + <source>Save multiproject</source> <translation type="unfinished"></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>&Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> + <source>&Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> + <source>Save &as...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add &project...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>&Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -33557,17 +33577,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation type="unfinished"></translation> </message> @@ -33894,7 +33914,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation type="unfinished"></translation> </message> @@ -33909,12 +33929,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation type="unfinished"></translation> </message> @@ -45356,12 +45376,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -45527,7 +45547,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation type="unfinished"></translation> </message> @@ -46533,7 +46553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -46585,17 +46605,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation type="unfinished"></translation> </message> @@ -52053,87 +52073,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> + <source>show output</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_es.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1080,32 +1080,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Añadir Proyecto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Nombre:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Introduzca el nombre del proyecto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>&Archivo de proyecto:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Introduzca el nombre del archivo de proyecto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Seleccione el archivo de proyecto utilizando un diálogo de selección de archivos</translation> </message> @@ -1115,35 +1115,45 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Introduzca una descripción corta para el proyecto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Descripción:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Propiedades del Proyecto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Archivos de proyecto (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation>Seleccionar para hacer este proyecto el proyecto principal</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation>Es el proyecto &principal</translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagramBuilder</name> @@ -14777,17 +14787,17 @@ <translation>Texto</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Seleccionar un directorio</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Detener</translation> </message> @@ -14852,7 +14862,7 @@ <translation>Reemplazar</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Reemplazar en Archivos</translation> </message> @@ -14867,37 +14877,37 @@ <translation>Abrir primera ocurrencia</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Expresión de búsqueda no válida</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>La expresión de búsqueda no es válida.</p><p>Error:{0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo leer el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Los hash actual y original del archivos <b>{0}</b> son distintos. Abandonando.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -15000,22 +15010,22 @@ <translation>Ruta</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Detener</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Presione para detener la búsqueda</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Abre el archivo seleccionado</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Seleleccione el directorio de búsqueda</translation> </message> @@ -16374,17 +16384,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation>Seleccionar archivo de hoja de estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Hojas de Estilos Qt (*.qss);;Hojas de Estilos CSS (*.css);;Todos los Archivos(*)</translation> </message> @@ -16678,22 +16688,22 @@ <translation>Qt Assistant</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Seleccionar visor personalizado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Seleccionar Navegador Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Seleccionar Visor de PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Seleccionar Visor de CHM</translation> </message> @@ -19526,12 +19536,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <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> @@ -31433,238 +31443,253 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>&New...</source> <translation>&Nuevo...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>&Open...</source> <translation>&Abrir...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> + <location filename="../MultiProject/MultiProject.py" line="632"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> + <location filename="../MultiProject/MultiProject.py" line="645"/> <source>&Save</source> <translation>&Guardar</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save &as...</source> <translation>Guardar co&mo...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="671"/> <source>Add &project...</source> <translation>Añadir &proyecto...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="686"/> <source>&Properties...</source> <translation>&Propiedades...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Multiproyecto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Abrir Multiproyectos &recientes</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Multiproyecto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>&Borrar</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Leer archivo de multiproyecto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Guardar archivo de multiproyecto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Abrir Multiproyecto</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Archivos de multiproyecto (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Archivos de multiproyecto (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Guardar multiproyecto como</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Cerrar Multiproyecto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>El multiproyecto actual tiene cambios sin guardar.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Nuevo Multiproyecto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Generar un nuevo multiproyecto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Nuevo...</b><p>Abre un diálogo para introducir la información para un nuevo multiproyecto.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Abrir un multiproyecto existente</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Abrir...</b><p>Abre un multiproyecto existente.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Cerrar Multiproyecto</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>New multiproject</source> + <translation>Nuevo Multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Generar un nuevo multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Nuevo...</b><p>Abre un diálogo para introducir la información para un nuevo multiproyecto.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Abrir un multiproyecto existente</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Abrir...</b><p>Abre un multiproyecto existente.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Cerrar Multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> <source>Close the current multiproject</source> <translation>Cierra el multiproyecto actual</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> + <location filename="../MultiProject/MultiProject.py" line="638"/> <source><b>Close</b><p>This closes the current multiproject.</p></source> <translation><b>Cerrar</b><p>Cierra el multiproyecto actual.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Guardar multiproyecto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Guarda el multiproyecto actual</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Guardar</b><p>Guarda el multiproyecto actual.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Guardar el multiproyecto actual en un nuevo archivo</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Guardar como</b><p>Guarda el multiproyecto en nuevo archivo.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Añadir proyecto al multiproyecto</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Añadir un nuevo proyecto al multiproyecto actual</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Añadir proyecto...</b><p>Abre un diálogo para añadir un proyecto al multiproyecto actual.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Propiedades del multiproyecto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Ver las propiedades del multiproyecto</translation> + <source>Save multiproject</source> + <translation>Guardar multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Guarda el multiproyecto actual</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Guardar</b><p>Guarda el multiproyecto actual.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Guardar el multiproyecto actual en un nuevo archivo</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Guardar como</b><p>Guarda el multiproyecto en nuevo archivo.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Añadir proyecto al multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Añadir un nuevo proyecto al multiproyecto actual</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Añadir proyecto...</b><p>Abre un diálogo para añadir un proyecto al multiproyecto actual.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Propiedades del multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Ver las propiedades del multiproyecto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Propiedades...</b><p>Muestra un diálogo para editar las propiedades del multiproyecto.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de multiproyecto <b>{0}</b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de multiproyecto <b>{0}</b> no ha podido ser guardado.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Archivos de multiproyecto (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Propiedades</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation>Añadir Proyecto...</translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -33931,17 +33956,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>Aceptar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el proceso.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> @@ -34258,17 +34283,17 @@ <translation>(no configurado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(no ejecutable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(no encontrado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(desconocido)</translation> </message> @@ -46018,12 +46043,12 @@ <translation>Alt+M</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <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> @@ -46185,7 +46210,7 @@ <translation>directorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Directorio de trabajo</translation> </message> @@ -47227,7 +47252,7 @@ <translation>&Protocolo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -47270,12 +47295,12 @@ <translation>&Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Seleccionar Repositorio-Directorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Seleccionar Directorio del Proyecto</translation> </message> @@ -47295,7 +47320,7 @@ <translation>Seleccione el directorio del proyecto utilizando un diálogo de selección de directorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation>&Ruta:</translation> </message> @@ -52813,87 +52838,87 @@ <translation>Archivo &ejecutable:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>sin redirección</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>mostrar salida</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>insertar en el editor actual</translation> + <source>show output</source> + <translation>mostrar salida</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>insertar en el editor actual</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>reemplazar selección en el editor actual</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Añadir entrada de herramienta</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Primero debe establecer un ejecutable para añadir al menú de herramientas.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Primero debe insertar un texto de entrada de menú para añadir el programa seleccionado al menú de herramientas.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>No ha podido encontrarse el archivo seleccionado, o no es un ejecutable. Por favor, escoja un nombre de archivo de un ejecutable.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Cambiar entrada de herramienta</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Primero debe establecer un ejecutable para cambiar la entrada del menú de herramientas.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Primero debe insertar un texto de entrada de menú para cambiar la entrada del menú de herramientas seleccionada.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>No ha podido encontrarse el archivo seleccionado, o no es un ejecutable. Por favor, escoja un nombre de archivo de un ejecutable.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Seleccionar ejecutable</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>El archivo seleccionado no es un ejecutable. Por favor, escoja un nombre de archivo de un ejecutable.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Seleccionar archivo de icono</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Archivos de Iconos (*.png)</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Ya existe una entrada para el texto de menú {0}.</translation> </message>
--- a/i18n/eric5_fr.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_fr.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1171,32 +1171,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Ajouter un projet</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Nom:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Entrer le nom du projet</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>&Fichier projet:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Entrer le nom du fichier projet</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Sélection du fichier projet via une boite de sélection</translation> </message> @@ -1206,12 +1206,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Description:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Entrer une courte description du projet</translation> </message> @@ -1226,7 +1226,7 @@ <translation type="obsolete">Est le projet &principal</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Propriétés du projet</translation> </message> @@ -1236,20 +1236,30 @@ <translation type="obsolete">Fichiers projets (*.e4p *.e4pz)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Fichiers projets (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -15969,7 +15979,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Sélection répertoire</translation> </message> @@ -16104,12 +16114,12 @@ <translation>Texte</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Trouver</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Arrêt</translation> </message> @@ -16174,7 +16184,7 @@ <translation>Remplacer</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Remplacer dans les fichiers</translation> </message> @@ -16199,37 +16209,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation type="unfinished">Ouvrir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copier chemin dans le Presse-Papiers</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -16332,22 +16342,22 @@ <translation>Chemin</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Ouvre le fichier sélectionné</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Cliquer pour stopper la recherche</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Sélectionne un répertoire de recherche</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Arrêt</translation> </message> @@ -17823,17 +17833,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished">Système</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished">Sélectionne une feuille de style</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Feuilles Qt Style (*.qss);;Feuilles CSS (*.css);;Tous les fichiers (*)</translation> </message> @@ -18168,22 +18178,22 @@ <translation type="obsolete">Navigateur Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Sélection d'un Navigateur Personalisé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Sélection d'un Navigateur Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Sélection d'un visualiseur de PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Sélection d'un visualiseur CHM</translation> </message> @@ -21248,12 +21258,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -33892,7 +33902,7 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Lecture d'un fichier multi-projet</translation> </message> @@ -33917,7 +33927,7 @@ <translation type="obsolete"><p>Le fichier multi-projet <b>%1</b> possède un contenu non valide.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Enregistre le fichier multi-projet</translation> </message> @@ -33927,7 +33937,7 @@ <translation type="obsolete"><p>Impossible d'écrire le fichier multi-projet <b>%1</b>.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Ouvrir un multi-projet</translation> </message> @@ -33944,10 +33954,10 @@ <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Fichiers multi-projets (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Fichiers multi-projets (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Enregistre le fichier multi-projet en tant que</translation> </message> @@ -33957,7 +33967,7 @@ <translation type="obsolete">Fichiers multi-projets (*.e4m);;Fichiers multi-projets compressés (*.e4mz)</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Enregistrer fichier</translation> </message> @@ -33967,208 +33977,223 @@ <translation type="obsolete"><p>Le fichier <b>%1</b> existe déjà.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Ferme le multi-projet</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Le multi-projet courant a des modifications non-enregistrées.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Nouveau multi-projet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>&New...</source> - <translation>&Nouveau...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Génère un nouveau multi-projet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Nouveau...</b><p>Ouvre une boite de dialogue pour saisir les informations du nouveau multi-projet.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> - <source>&Open...</source> - <translation>&Ouvrir...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Ouvre un multi-projet existant</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Ouvre...</b><p>Ouvre un multi-projet existant.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Ferme le multi-projet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>&Close</source> - <translation>&Fermer</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation>Fermer le multi-projet en cours</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation><b>Fermer</b><p>Ferme le multi-projet en cours.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Enregistre le multiprojet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>&Save</source> - <translation>&Enregistrer</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Enregistre le multi-projet courant</translation> + <source>New multiproject</source> + <translation>Nouveau multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>&New...</source> + <translation>&Nouveau...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Génère un nouveau multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Nouveau...</b><p>Ouvre une boite de dialogue pour saisir les informations du nouveau multi-projet.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Enregistrer</b><p>Enregistre le multi-projet courant.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> - <source>Save &as...</source> - <translation>&Enregistrer sous...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Enregistre le multi-projet courant dans un nouveau fichier</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Enregistrer sous</b><p>Enregistre le multi-projet en cours dans un nouveau fichier.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Ajoute un projet au multi-projet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add &project...</source> - <translation>Ajouter un &projet...</translation> + <source>&Open...</source> + <translation>&Ouvrir...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Ouvre un multi-projet existant</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Ouvre...</b><p>Ouvre un multi-projet existant.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Ferme le multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>&Close</source> + <translation>&Fermer</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close the current multiproject</source> + <translation>Fermer le multi-projet en cours</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="638"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation><b>Fermer</b><p>Ferme le multi-projet en cours.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="645"/> + <source>Save multiproject</source> + <translation>Enregistre le multiprojet</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Ajoute un projet au multi-projet courant</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Ajouter un projet...</b><p>Ouvre une fenêtre permettant d'ajouter un projet au multi-projet courant.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Propriétés du multi-projet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>&Properties...</source> - <translation>&Propriétés...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Affiche les propriétés du multi-projet</translation> + <source>&Save</source> + <translation>&Enregistrer</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Enregistre le multi-projet courant</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Enregistrer</b><p>Enregistre le multi-projet courant.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> + <source>Save &as...</source> + <translation>&Enregistrer sous...</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Enregistre le multi-projet courant dans un nouveau fichier</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Enregistrer sous</b><p>Enregistre le multi-projet en cours dans un nouveau fichier.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Ajoute un projet au multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add &project...</source> + <translation>Ajouter un &projet...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Ajoute un projet au multi-projet courant</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Ajouter un projet...</b><p>Ouvre une fenêtre permettant d'ajouter un projet au multi-projet courant.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Propriétés du multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>&Properties...</source> + <translation>&Propriétés...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Affiche les propriétés du multi-projet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Propriétés...</b><p>Affiche une boite de dialogue pour éditer les propriétés du multi-projet.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Multi-projet</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Ouvre les multi-projets &récents</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Multi-projet</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>&Effacer</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Fichiers multi-projets (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Propriétés</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -36768,7 +36793,7 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -36778,12 +36803,12 @@ <translation type="obsolete"><p>Impossible de démarrer le processus.<br>Assurez-vous qu'il est bien disponible <b>%1</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> @@ -37210,17 +37235,17 @@ <translation>(non configuré)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(non executable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(non trouvé)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(inconnu)</translation> </message> @@ -50646,7 +50671,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -50656,7 +50681,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="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -50754,7 +50779,7 @@ <context> <name>SvnCommandDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Répertoire de travail</translation> </message> @@ -52011,12 +52036,12 @@ <context> <name>SvnNewProjectOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Sélection du répertoire référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Selection d'un répertoire projet</translation> </message> @@ -52063,7 +52088,7 @@ <translation>&Protocole:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -52127,7 +52152,7 @@ <translation>Sélection du répertoire du projet via une boite de sélection</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation type="unfinished"></translation> </message> @@ -57907,52 +57932,52 @@ <context> <name>ToolConfigurationDialog</name> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Ajouter un outil</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Vous devez d'abord définir un executable à ajouter dans le menu Outils.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Pour ajouter le programme sélectionné au menu Outils, vous devez d'abord indiquer le texte figurant dans le menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Le fichier sélectionné est introuvable ou non-executable. Prière de choisir un fichier executable.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Modifier l'entrée Outil</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Vous devez définir un executable pour modifier l'entrée du menu Outils.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Vous devez indiquer entrée de menu pour modifier l'entrée du menu Outils sélectionnée.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Le fichier sélectionné est introuvable ou non-executable. Prière de choisir un fichier executable.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Sélectionner un executable</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Le fichier sélectionné n'est pas executable. Prière de choisir un fichier executable.</translation> </message> @@ -58216,22 +58241,22 @@ <translation>&Fichier executable:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>pas de redirection</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>afficher la sortie</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>insérer la sortie dans l'éditeur courant</translation> + <source>show output</source> + <translation>afficher la sortie</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>insérer la sortie dans l'éditeur courant</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>remplacer la sélection dans l'éditeur courant</translation> </message> @@ -58241,12 +58266,12 @@ <translation type="obsolete">Le menu comporte déjà une entrée %1.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Sélection d'un fichier icône</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Fichiers icônes (*.png)</translation> </message> @@ -58256,7 +58281,7 @@ <translation><b>Redirection de la sortie<b><p>Sélectionner le type de redirection de la sortie standard. La sortie d'erreur peut ne pas être redirigée ou bien être affichée dans la fenêtre de log .</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_it.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1127,32 +1127,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Aggiungi progetto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Nome:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Inserisci il nome del progetto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>&File Progetto:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Inserisci il nome del file progetto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Seleziona il file progetto con il dialogo</translation> </message> @@ -1162,12 +1162,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Descrizione:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Inserisci una breve descrizione per il progetto</translation> </message> @@ -1182,25 +1182,35 @@ <translation type="obsolete">E' il progetto &master</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Proprietà del progetto</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>File progetto (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -15093,7 +15103,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Seleziona una directory</translation> </message> @@ -15228,12 +15238,12 @@ <translation>Testo</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Trova</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Ferma</translation> </message> @@ -15298,7 +15308,7 @@ <translation>Sostituisci</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Sostituisci nei file</translation> </message> @@ -15313,37 +15323,37 @@ <translation>Feeling Like</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Copia il path nella Clipboard</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Espressione di ricerca non valida</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>L'espressione di ricerca non è valida.</p><p>Errore: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso leggere il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>L'hash originale e quello corrente del file <b>{0}</b> sono differenti. Lo salto.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> @@ -15446,22 +15456,22 @@ <translation>Percorso</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Apri i file selezionati</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Premi per fermare la ricerca</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Seleziona directory di ricerca</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Ferma</translation> </message> @@ -16858,17 +16868,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished">Sistema</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished">Seleziona il foglio di stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Tutti i file (*)</translation> </message> @@ -17172,22 +17182,22 @@ <translation type="obsolete">Browser Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Seleziona visualizzatore personalizzato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Seleziona Browser Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Seleziona visualizzatore PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Seleziona visualizzatore CHM</translation> </message> @@ -20151,12 +20161,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <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> @@ -32535,238 +32545,253 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Leggi file multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Salva file multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Apri multiprogetto</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>File multiprogetto (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">File multiprogetto (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Salva multiprogetto come</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Chiudi Multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Il multiprogetto corrente ha delle modifiche non salvata.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>New multiproject</source> <translation>Nuovo multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>&New...</source> - <translation>&Nuovo...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Genera un nuovo multiprogetto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Nuovo...</b><p>Apre un dialogo per l'inserimento delle informazioni per un nuovo multiprogetto.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> - <source>&Open...</source> - <translation>&Apri...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Apri un multiprogetto esistente</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Apri...</b><p>Apre un multiprogetto esistente.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Chiudi multiprogetto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>&Close</source> - <translation>&Chiudi</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation>Chiudi il multiprogetto corrente</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation><b>Chiudi</b><p>Chiude l'attuale multiprogetto.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Salva multiprogetto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>&Save</source> - <translation>&Salva</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Salva il multiprogetto corrente</translation> + <source>&New...</source> + <translation>&Nuovo...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Genera un nuovo multiprogetto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Nuovo...</b><p>Apre un dialogo per l'inserimento delle informazioni per un nuovo multiprogetto.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Salva</b><p>Salva l'attuale multiprogetto.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> - <source>Save &as...</source> - <translation>S&alva come...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Salva il multiprogetto attuale come un nuovo file</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Salva as </b><p>Salva l'attuale multiprogetto come nuovo.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Aggiungi un progetto al multiprogetto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add &project...</source> - <translation>Aggiungi &progetto...</translation> + <source>&Open...</source> + <translation>&Apri...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Apri un multiprogetto esistente</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Apri...</b><p>Apre un multiprogetto esistente.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Chiudi multiprogetto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>&Close</source> + <translation>&Chiudi</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close the current multiproject</source> + <translation>Chiudi il multiprogetto corrente</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="638"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation><b>Chiudi</b><p>Chiude l'attuale multiprogetto.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="645"/> + <source>Save multiproject</source> + <translation>Salva multiprogetto</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Aggiunti un progetto al multiprogetto corrente</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Aggiungi progetto...</b><p>Apre un dialogo per aggiungere un progetto al corrente multiprogetto.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Proprietà multiprogetto</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>&Properties...</source> - <translation>&Proprietà...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Mostra le proprietà del multiprogetto</translation> + <source>&Save</source> + <translation>&Salva</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Salva il multiprogetto corrente</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Salva</b><p>Salva l'attuale multiprogetto.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> + <source>Save &as...</source> + <translation>S&alva come...</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Salva il multiprogetto attuale come un nuovo file</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Salva as </b><p>Salva l'attuale multiprogetto come nuovo.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Aggiungi un progetto al multiprogetto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add &project...</source> + <translation>Aggiungi &progetto...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Aggiunti un progetto al multiprogetto corrente</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Aggiungi progetto...</b><p>Apre un dialogo per aggiungere un progetto al corrente multiprogetto.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Proprietà multiprogetto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>&Properties...</source> + <translation>&Proprietà...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Mostra le proprietà del multiprogetto</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Proprietà...</b><p>Mosta un dialogo per modificare le proprietà di un multiprogetto.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Apri un multiprogetto &recente</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Multiprogetto</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>Pulis&ci</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Il file multiprogetto <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Il file multiprogetto <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">File multiprogetto (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Proprietà</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -35591,17 +35616,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare il processo.<br>Assicurarsi sia disponibile come <b>{0}</b>.</p></translation> </message> @@ -35953,17 +35978,17 @@ <translation>(non configurato)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(non eseguibile)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(non trovato)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(sconosciuto)</translation> </message> @@ -48411,12 +48436,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <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> @@ -48514,7 +48539,7 @@ <context> <name>SvnCommandDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Directory di lavoro</translation> </message> @@ -49594,12 +49619,12 @@ <context> <name>SvnNewProjectOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Seleziona la directory del Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Seleziona la directory del progetto</translation> </message> @@ -49645,7 +49670,7 @@ <translation>&Protocollo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -49709,7 +49734,7 @@ <translation>Seleziona la directory del progetto con un dialogo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation type="unfinished"></translation> </message> @@ -55443,52 +55468,52 @@ <context> <name>ToolConfigurationDialog</name> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Aggiungi un tool</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Devi prima impostare un eseguibile da aggiungere al Tools-Menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Devi prima inserire un elemento di testo del menu per aggiungere il programma selezionato dal Tools-Menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Il file sezionato non può essere trovato o non è un eseguibile. Per cortesia scegliere un eseguibile.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Cambia elemento tool</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Devi impostare un eseguibile per cambiare l'elemento Tools-Menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Devi inserire un elemento di testo del menu per aggiungere il programma selezionato dal Tools-Menu.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Il file sezionato non può essere trovato o non è un eseguibile. Per cortesia scegliere un eseguibile esistente.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Seleziona eseguibile</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Il file sezionato non non è un eseguibile. Per cortesia scegliere un eseguibile.</translation> </message> @@ -55752,32 +55777,32 @@ <translation>File &eseguibile:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>nessuna redirezione</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>mostra output</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>inserisci nell'editor attuale</translation> + <source>show output</source> + <translation>mostra output</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>inserisci nell'editor attuale</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>sostituisci la seleziona dell'editor attuale</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Seleziona file icona</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Icon files (*.png)</translation> </message> @@ -55787,7 +55812,7 @@ <translation><b>Redirigi output<b><p>Seleziona il metodo di redirezione. Il canale standard di errore non è rediretto o mostrato nel visualizzatore log.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Un elemento per il testo {0} esiste già nel menù.</translation> </message>
--- a/i18n/eric5_ru.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_ru.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1126,32 +1126,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Добавить проект</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Имя:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Введите название проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>&Файл проекта:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Введите название проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Выберите файл проекта с помощью файлового диалога</translation> </message> @@ -1161,7 +1161,7 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Введите краткое описание проекта</translation> </message> @@ -1176,30 +1176,40 @@ <translation type="obsolete">Это &главный проект</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Описание:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Свойства проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -15223,7 +15233,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -15358,12 +15368,12 @@ <translation>Текст</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Стоп</translation> </message> @@ -15418,17 +15428,17 @@ <translation>Заменить</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> @@ -15453,27 +15463,27 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Неверное выражение для поиска</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation> </message> @@ -15576,22 +15586,22 @@ <translation>Путь</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Открыть выбранный файл</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Нажмите, чтобы остановить поиск</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Выберите каталог для поиска</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Стоп</translation> </message> @@ -16991,17 +17001,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation>Система</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation>Выберите файл стиля</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Стили Qt (*.qss);;Каскадные стили (*.css);;Все файлы (*)</translation> </message> @@ -17307,22 +17317,22 @@ <translation type="obsolete">Просмотрщик Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Выбрать специальный просмотрщик</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Выбрать обозреватель Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Выберите просмотрщик PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Выберите просмотрщик CHM</translation> </message> @@ -20291,12 +20301,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -32707,238 +32717,253 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="605"/> <source>&New...</source> <translation>&Новый...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> + <location filename="../MultiProject/MultiProject.py" line="632"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> + <location filename="../MultiProject/MultiProject.py" line="645"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="671"/> <source>Add &project...</source> <translation>Добавить &проект...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="686"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Открыть &недавние мултипроекты</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Загрузить файл мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл мултипроекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Сохранить файл мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл мултипроекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Открыть мултипроект</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Файлы мултипроектов (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Файлы мултипроектов (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Сохранить файл мултипроекта как</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Закрыть мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Изменения в текущем мултипроекте не сохранены.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Новый мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Создать новый мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом мултипроекте.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Открыть существующий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Открыть...</b><p>Открыть существующий мултипроект.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Закрыть мултипроект</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>New multiproject</source> + <translation>Новый мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Создать новый мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом мултипроекте.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Открыть существующий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Открыть...</b><p>Открыть существующий мултипроект.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Закрыть мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> <source>Close the current multiproject</source> <translation>Закрыть текущий мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> + <location filename="../MultiProject/MultiProject.py" line="638"/> <source><b>Close</b><p>This closes the current multiproject.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Сохранить файл мултипроекта</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Закрыть текущий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Сохранить текущий мултипроект в новый файл</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Сохранить как</b><p> Сохранить текущий мултипроект в новый файл.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Добавить проект в мултипроект</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Добавить проект в текущий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Добавить проект...</b><p>Открыть диалог для добавления проект в текущий мултипроект.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Свойства мултипроекта</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Свойства мултипроекта</translation> + <source>Save multiproject</source> + <translation>Сохранить файл мултипроекта</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Закрыть текущий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Сохранить текущий мултипроект в новый файл</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Сохранить как</b><p> Сохранить текущий мултипроект в новый файл.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Добавить проект в мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Добавить проект в текущий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Добавить проект...</b><p>Открыть диалог для добавления проект в текущий мултипроект.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Свойства мултипроекта</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Свойства мултипроекта</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Свойства...</b><p>Показать диалог для редактирования свойств мултипроекта.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Файлы мултипроектов (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -35767,17 +35792,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить процесс.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>OK</translation> </message> @@ -36124,12 +36149,12 @@ <translation>(не настроено)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(не исполняемый)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(не найдено)</translation> </message> @@ -36139,7 +36164,7 @@ <translation>Внешние программы</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(неизвестный)</translation> </message> @@ -48547,12 +48572,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -48650,7 +48675,7 @@ <context> <name>SvnCommandDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Рабочий каталог</translation> </message> @@ -49731,12 +49756,12 @@ <context> <name>SvnNewProjectOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Задайте каталог репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Выберите каталог проекта</translation> </message> @@ -49782,7 +49807,7 @@ <translation>&Протокол:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -49846,7 +49871,7 @@ <p>Задайте URL модуля. Для репозитория со стандартным расположением файлов, путь не должен содержать части trunk, tags или branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation>Пут&ь:</translation> </message> @@ -55541,52 +55566,52 @@ <context> <name>ToolConfigurationDialog</name> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Добавить инструментарий</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Для добавления в Инструментарий необходимо сначала задать исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Для добавления программы в меню необходимо задать текст этого меню.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Изменить элемент Инструментария</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Для изменения элемента Инструментария необходимо задать исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Для изменения программы в меню необходимо задать текст этого меню.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Выбор исполняемого файла</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> @@ -55850,37 +55875,37 @@ <translation>П&рограмма:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>Нет перенаправления</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>показывать вывод</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>вставлять в текущий редактор</translation> + <source>show output</source> + <translation>показывать вывод</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>вставлять в текущий редактор</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>заменить выделение в текущем редакторе</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Элемент меню с текстом '{0}' уже существует.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Задайте имя файла пиктограммы</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Файлы пиктограмм (*.png)</translation> </message>
--- a/i18n/eric5_tr.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_tr.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1123,32 +1123,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Proje Ekle</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>A&dı:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Projenin adını giriniz</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>Proje &Dosyası:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Proje dosyasının adını giriniz</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Dosya seçme diyaloğu ile bir proje dosyası seç</translation> </message> @@ -1158,12 +1158,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>A&çıklama:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Proje için kısa bir açıklama giriniz</translation> </message> @@ -1178,7 +1178,7 @@ <translation type="obsolete">Ana proje &mi</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Proje Özellikleri</translation> </message> @@ -1188,20 +1188,30 @@ <translation type="obsolete">Proje Dosyaları (*.e4p *.e4pz)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Proje Dosyaları (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -15362,57 +15372,57 @@ <translation>Yerdeğiştir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Dur</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Bul</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>Dosyalarda yer değiştir</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Geçersiz arama ifadesi</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>Dizin Seçiniz</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation>Yolu Panoya kopyala</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -15515,22 +15525,22 @@ <translation>Yol</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>Dur</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>Aramayı durdurmak için bas</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>Seçilen dosya açılıyor</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>Arama dizinini seç</translation> </message> @@ -16931,17 +16941,17 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished">Sistem</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished">Sayfa stil dosyasını seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Sayfa stili (*.qss);;Üstüste Sayfa Stili (*.css);;Tüm Dosyalar (*)</translation> </message> @@ -17258,22 +17268,22 @@ <translation type="obsolete">Web Gözatıcısı</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Geleneksel-Görüntüleyiciyi seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Web-Gözatıcısını seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>PDF-Görüntüleyicisini seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>CHM-Görüntüleyicisini Seçiniz</translation> </message> @@ -20217,12 +20227,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <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> @@ -32521,7 +32531,7 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>Çokluproje dosyasını oku</translation> </message> @@ -32531,7 +32541,7 @@ <translation type="obsolete">Sıkıştırılmış çokluproje dosyaları desteklenmiyor. Sıkıştırma kütüphanesi kayıp.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Çoklu Proje dosyası <b>{0}</b> okunamıyor.</p></translation> </message> @@ -32546,17 +32556,17 @@ <translation type="obsolete"><p>Çokluproje dosyası <b>{0}</b> uygunsuz içirğe sahip.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>Çokluproje Dosyasını kaydet</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Çoklu Proje dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>Çokluproje Aç</translation> </message> @@ -32573,10 +32583,10 @@ <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Çokluproje Dosyaları (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Çokluproje Dosyaları (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>Çokluprojeleri olarak kaydet</translation> </message> @@ -32586,7 +32596,7 @@ <translation type="obsolete">Çokluproje Dosyaları (*.e4m);;Sıkıştırılmış Çokluproje Dosyaları (*.e4mz)</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> @@ -32596,198 +32606,213 @@ <translation type="obsolete"><p><b>{0}</b> dosyası zaten var.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>Çokluprojeyi Kapat</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>Geçerli çokluprojede kaydedilmemiş değişiklikler var.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>Yeni Çokluproje</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>&New...</source> - <translation>Ye&ni...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Yeni bir Çokluproje üret</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Yeni...</b><p>Bu yeni bir çokluproje için gerekli bilgilerin girileceği bir diyalog açar.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> - <source>&Open...</source> - <translation>&Aç...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Var olan Çokluprojeyi aç</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Aç...</b><p>Bu varolon bir projeyi açar.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Çokluprojeyi kapat</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>&Close</source> - <translation>&Kapat</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation>Geçerli çokluprojeyi kapat</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation><b>Kapat</b><p>Bu geçerli çokluprojeyi kapatır.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Çokluprojeyi kaydet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>&Save</source> - <translation>&Kaydet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Geçerli çokluprojeyi kaydet</translation> + <source>New multiproject</source> + <translation>Yeni Çokluproje</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>&New...</source> + <translation>Ye&ni...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>Yeni bir Çokluproje üret</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Yeni...</b><p>Bu yeni bir çokluproje için gerekli bilgilerin girileceği bir diyalog açar.</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Kaydet</b><p>Bu geçerli çokluprojeyi kaydeder.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> - <source>Save &as...</source> - <translation>Farklı k&aydet...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Geçerli çokluprojeyi yeni bir dosya olarak kaydet</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Farklı kaydet</b><p>Bu geçerli çokluprojeyi yeni bir dosyaya kaydeder.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>Çokluprojeye proje ekle</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add &project...</source> - <translation>&Proje ekle...</translation> + <source>&Open...</source> + <translation>&Aç...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>Var olan Çokluprojeyi aç</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Aç...</b><p>Bu varolon bir projeyi açar.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>Çokluprojeyi kapat</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>&Close</source> + <translation>&Kapat</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close the current multiproject</source> + <translation>Geçerli çokluprojeyi kapat</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="638"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation><b>Kapat</b><p>Bu geçerli çokluprojeyi kapatır.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="645"/> + <source>Save multiproject</source> + <translation>Çokluprojeyi kaydet</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>Geçerli çokluprojeye bir proje ekle</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>Proje ekle...</b><p>Bu geçerli çokluprojeye bir proje eklemek için diyalog açar.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>Çokluproje özellikleri</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>&Properties...</source> - <translation>&Özellikler...</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>Çokluproje özelliklerini göster</translation> + <source>&Save</source> + <translation>&Kaydet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>Geçerli çokluprojeyi kaydet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Kaydet</b><p>Bu geçerli çokluprojeyi kaydeder.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> + <source>Save &as...</source> + <translation>Farklı k&aydet...</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="662"/> + <source>Save the current multiproject to a new file</source> + <translation>Geçerli çokluprojeyi yeni bir dosya olarak kaydet</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="664"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Farklı kaydet</b><p>Bu geçerli çokluprojeyi yeni bir dosyaya kaydeder.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add project to multiproject</source> + <translation>Çokluprojeye proje ekle</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="671"/> + <source>Add &project...</source> + <translation>&Proje ekle...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="676"/> + <source>Add a project to the current multiproject</source> + <translation>Geçerli çokluprojeye bir proje ekle</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="678"/> + <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> + <translation><b>Proje ekle...</b><p>Bu geçerli çokluprojeye bir proje eklemek için diyalog açar.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>Multiproject properties</source> + <translation>Çokluproje özellikleri</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="686"/> + <source>&Properties...</source> + <translation>&Özellikler...</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="691"/> + <source>Show the multiproject properties</source> + <translation>Çokluproje özelliklerini göster</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="693"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Özellikler...</b><p>Bu çokluproje özelliklerini düzenlemek için sir diyalog gösterir.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="713"/> <source>&Multiproject</source> <translation>&Çokluproje</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="714"/> <source>Open &Recent Multiprojects</source> <translation>Geçmiş Çoklup&rojeleri Aç</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="755"/> <source>Multiproject</source> <translation>Çokluproje</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="814"/> <source>&Clear</source> <translation>T&emizle</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="447"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="511"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Çokluproje Dosyaları (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Özellikler</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -35307,17 +35332,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>İşlem başlatılamıyor.<br>Bu durum büyük olasılıkla şundan kaynaklanıyto <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="635"/> <source>OK</source> <translation>TAMAM</translation> </message> @@ -35689,7 +35714,7 @@ <translation>CORBA IDL Derleyicisi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(bilinmeyen)</translation> </message> @@ -35704,12 +35729,12 @@ <translation>(ayarlanmadı)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(yürütülemez)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(bulunamadı)</translation> </message> @@ -47547,12 +47572,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <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> @@ -47723,7 +47748,7 @@ <translation>proje dizini</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="73"/> <source>Working directory</source> <translation>Çalışma dizini</translation> </message> @@ -48759,7 +48784,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="135"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -48811,17 +48836,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="70"/> <source>Select Repository-Directory</source> <translation>Kaynak Havuzu- Dizinin Seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="98"/> <source>Select Project Directory</source> <translation>Proje Dizinini Seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="129"/> <source>Pat&h:</source> <translation type="unfinished"></translation> </message> @@ -54690,87 +54715,87 @@ <translation>Yürütül&ebilir dosya:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> - <source>show output</source> - <translation>çıktıyı göster</translation> - </message> - <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> - <source>insert into current editor</source> - <translation>geçerli dosyaya ekle</translation> + <source>show output</source> + <translation>çıktıyı göster</translation> </message> <message> <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> + <source>insert into current editor</source> + <translation>geçerli dosyaya ekle</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>Seçimi geçerli düzenleyiciye yerleştir</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Araç boşluğu ekle</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="113"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="122"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="133"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Araç boşluğunu değiştir</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="175"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="184"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Yürütülebileceği seç</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="279"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>İcon dosyasını seçiniz</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="294"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Ikon dosyaları(*.png)</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jan 11 13:53:42 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Jan 11 20:03:38 2014 +0100 @@ -1161,32 +1161,32 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>添加项目</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>名称(&N)：</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>输入项目名称</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>项目文件(&f)：</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>输入项目文件名称</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>通过文件选择对话框选择项目文件</translation> </message> @@ -1196,12 +1196,12 @@ <translation type="obsolete">……</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>描述(&D)：</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="72"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>为项目输入简短描述</translation> </message> @@ -1216,7 +1216,7 @@ <translation type="obsolete">是主项目</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="47"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>项目属性</translation> </message> @@ -1226,20 +1226,30 @@ <translation type="obsolete">项目文件 (*.e4p *.e4pz)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="65"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation type="unfinished">项目文件 (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="85"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="88"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -16063,22 +16073,22 @@ <translation>替换</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="64"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>中止</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="69"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>查找</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source>Replace in Files</source> <translation>在文件中替换</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="540"/> + <location filename="../UI/FindFileDialog.py" line="537"/> <source>Select directory</source> <translation>选择文件夹</translation> </message> @@ -16103,37 +16113,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="678"/> + <location filename="../UI/FindFileDialog.py" line="675"/> <source>Open</source> <translation type="unfinished">打开</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="679"/> + <location filename="../UI/FindFileDialog.py" line="676"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="373"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="610"/> + <location filename="../UI/FindFileDialog.py" line="607"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="651"/> + <location filename="../UI/FindFileDialog.py" line="648"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="625"/> + <location filename="../UI/FindFileDialog.py" line="622"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation type="unfinished"></translation> </message> @@ -16236,22 +16246,22 @@ <translation>路径</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="56"/> + <location filename="../UI/FindFileNameDialog.py" line="57"/> <source>Stop</source> <translation>中止</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="58"/> + <location filename="../UI/FindFileNameDialog.py" line="59"/> <source>Press to stop the search</source> <translation>点击停止搜索</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="60"/> + <location filename="../UI/FindFileNameDialog.py" line="61"/> <source>Opens the selected file</source> <translation>打开已选文件</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.py" line="202"/> + <location filename="../UI/FindFileNameDialog.py" line="203"/> <source>Select search directory</source> <translation>选择搜索文件夹</translation> </message> @@ -17737,17 +17747,17 @@ <translation type="obsolete">……</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation type="unfinished">系统</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation type="unfinished">选择样式表文件</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="72"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt 样式表 (*.qss);;Cascading 样式表 (*.css);;所有文件 (*)</translation> </message> @@ -18156,22 +18166,22 @@ <translation type="obsolete">JavaScript 可以访问剪贴板</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="80"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>选择自定义浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="94"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>选择网络浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>选择 PDF 浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="122"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>选择 CHM 浏览器</translation> </message> @@ -21165,12 +21175,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -33808,7 +33818,7 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="228"/> <source>Read multiproject file</source> <translation>读取多重项目文件</translation> </message> @@ -33833,7 +33843,7 @@ <translation type="obsolete"><p>多重项目文件 <b>%1</b> 包含无效内容。</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="273"/> <source>Save multiproject file</source> <translation>保存多重项目文件</translation> </message> @@ -33843,7 +33853,7 @@ <translation type="obsolete"><p>无法写入多重项目文件 <b>%1</b>。</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="619"/> <source>Open multiproject</source> <translation>打开多重项目</translation> </message> @@ -33860,10 +33870,10 @@ <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>多重项目文件 (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">多重项目文件 (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> <source>Save multiproject as</source> <translation>多重项目另存为</translation> </message> @@ -33873,7 +33883,7 @@ <translation type="obsolete">多重项目文件 (*.e4m);;压缩的多重项目文件 (*.e4mz)</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="526"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -33883,208 +33893,223 @@ <translation type="obsolete"><p>文件 <b>%1</b> 已存在。</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>Close Multiproject</source> <translation>关闭多重项目</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="551"/> <source>The current multiproject has unsaved changes.</source> <translation>当前多重项目的更改未保存。</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>New multiproject</source> - <translation>新建多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> - <source>&New...</source> - <translation>新建(&N)……</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>生成一个新多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>新建……</b><p>打开一个对话框为新多重项目输入信息。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> - <source>&Open...</source> - <translation>打开(&O)……</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>打开一个存在的多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>打开…….</b><p>打开一个存在的多重项目。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>关闭多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>&Close</source> - <translation>关闭(&C)</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation>关闭当前多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation><b>关闭</b><p>关闭当前多重项目。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>保存多重项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>&Save</source> - <translation>保存(&S)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>保存当前多重项目</translation> + <source>New multiproject</source> + <translation>新建多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="605"/> + <source>&New...</source> + <translation>新建(&N)……</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="610"/> + <source>Generate a new multiproject</source> + <translation>生成一个新多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="611"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>新建……</b><p>打开一个对话框为新多重项目输入信息。</p></translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>保存</b><p>保存当前多重项目。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> - <source>Save &as...</source> - <translation>另存为(&a)……</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>将当前多重项目保存到一个新文件中</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>另存为</b><p>将当前多重项目保存到一个新文件中。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add project to multiproject</source> - <translation>为多重项目添加项目</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> - <source>Add &project...</source> - <translation>添加项目(&p)……</translation> + <source>&Open...</source> + <translation>打开(&O)……</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="624"/> + <source>Open an existing multiproject</source> + <translation>打开一个存在的多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="625"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>打开…….</b><p>打开一个存在的多重项目。</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>Close multiproject</source> + <translation>关闭多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="632"/> + <source>&Close</source> + <translation>关闭(&C)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close the current multiproject</source> + <translation>关闭当前多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="638"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation><b>关闭</b><p>关闭当前多重项目。</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="645"/> + <source>Save multiproject</source> + <translation>保存多重项目</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="645"/> - <source>Add a project to the current multiproject</source> - <translation>将项目添加到当前多重项目中</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> - <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> - <translation><b>添加项目……</b><p>打开一个对话框将项目添加到当前多重项目中。</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>Multiproject properties</source> - <translation>多重项目属性</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> - <source>&Properties...</source> - <translation>属性(&P)……</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> - <source>Show the multiproject properties</source> - <translation>显示多重项目属性</translation> + <source>&Save</source> + <translation>保存(&S)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save the current multiproject</source> + <translation>保存当前多重项目</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="650"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>保存</b><p>保存当前多重项目。</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="657"/> + <source>Save &as...</source> + <translation>另存为(&a)……</translation> </message>