Thu, 01 Oct 2020 17:39:16 +0200
Fixed an issue overriding tab and indent settings for Pygments based lexers.
--- a/eric6/APIs/Python3/eric6.api Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/APIs/Python3/eric6.api Thu Oct 01 17:39:16 2020 +0200 @@ -6291,8 +6291,10 @@ eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.save?4() eric6.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage?1() eric6.Preferences.ConfigurationPages.EditorKeywordsPage.create?4(dlg) +eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog.PygmentsMarker?7 eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog.getData?4() eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog.on_languageComboBox_currentIndexChanged?4(lang) +eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged?4(lang) eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog?1(*, editMode=False, languages=None, tabWidth=0, indentWidth=0, parent=None) eric6.Preferences.ConfigurationPages.EditorMouseClickHandlerPage.EditorMouseClickHandlerPage.save?4() eric6.Preferences.ConfigurationPages.EditorMouseClickHandlerPage.EditorMouseClickHandlerPage?1()
--- a/eric6/Documentation/Help/source.qhp Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Documentation/Help/source.qhp Thu Oct 01 17:39:16 2020 +0200 @@ -5230,8 +5230,11 @@ <keyword name="EditorLanguageTabIndentOverrideDialog" id="EditorLanguageTabIndentOverrideDialog" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog" /> <keyword name="EditorLanguageTabIndentOverrideDialog (Constructor)" id="EditorLanguageTabIndentOverrideDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.__init__" /> <keyword name="EditorLanguageTabIndentOverrideDialog (Module)" id="EditorLanguageTabIndentOverrideDialog (Module)" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html" /> + <keyword name="EditorLanguageTabIndentOverrideDialog.__populateLanguages" id="EditorLanguageTabIndentOverrideDialog.__populateLanguages" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.__populateLanguages" /> + <keyword name="EditorLanguageTabIndentOverrideDialog.__updateOkButton" id="EditorLanguageTabIndentOverrideDialog.__updateOkButton" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.__updateOkButton" /> <keyword name="EditorLanguageTabIndentOverrideDialog.getData" id="EditorLanguageTabIndentOverrideDialog.getData" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.getData" /> <keyword name="EditorLanguageTabIndentOverrideDialog.on_languageComboBox_currentIndexChanged" id="EditorLanguageTabIndentOverrideDialog.on_languageComboBox_currentIndexChanged" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.on_languageComboBox_currentIndexChanged" /> + <keyword name="EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged" id="EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged" ref="eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged" /> <keyword name="EditorMarkerMap" id="EditorMarkerMap" ref="eric6.QScintilla.EditorMarkerMap.html#EditorMarkerMap" /> <keyword name="EditorMarkerMap (Constructor)" id="EditorMarkerMap (Constructor)" ref="eric6.QScintilla.EditorMarkerMap.html#EditorMarkerMap.__init__" /> <keyword name="EditorMarkerMap (Module)" id="EditorMarkerMap (Module)" ref="eric6.QScintilla.EditorMarkerMap.html" />
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html Thu Oct 01 17:39:16 2020 +0200 @@ -59,7 +59,7 @@ <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>PygmentsMarker</td></tr> </table> <h3>Class Methods</h3> @@ -75,6 +75,14 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#EditorLanguageTabIndentOverrideDialog.__populateLanguages">__populateLanguages</a></td> +<td>Private method to populate the language combo boxes.</td> +</tr> +<tr> +<td><a href="#EditorLanguageTabIndentOverrideDialog.__updateOkButton">__updateOkButton</a></td> +<td>Private method to set the enabled status of the OK button.</td> +</tr> +<tr> <td><a href="#EditorLanguageTabIndentOverrideDialog.getData">getData</a></td> <td>Public method to get the entered data.</td> </tr> @@ -82,6 +90,10 @@ <td><a href="#EditorLanguageTabIndentOverrideDialog.on_languageComboBox_currentIndexChanged">on_languageComboBox_currentIndexChanged</a></td> <td>Private slot to handle the selection of a language.</td> </tr> +<tr> +<td><a href="#EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged">on_pygmentsLexerCombo_currentIndexChanged</a></td> +<td>Private slot to handle the selection of a language.</td> +</tr> </table> <h3>Static Methods</h3> @@ -103,23 +115,38 @@ flag indicating the edit mode (Note: in edit mode the language is fixed) </dd> -<dt><i>languages=</i> (list of str)</dt> +<dt><i>languages</i> (list of str)</dt> <dd> -list of available languages +list of existing languages (if in add mode) or + a list containing the language to be edited </dd> -<dt><i>tabWidth=</i> (int)</dt> +<dt><i>tabWidth</i> (int)</dt> <dd> tab width to be set </dd> -<dt><i>indentWidth=</i> (int)</dt> +<dt><i>indentWidth</i> (int)</dt> <dd> indentation width to be set </dd> -<dt><i>parent=</i> (QWidget)</dt> +<dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> </dl> +<a NAME="EditorLanguageTabIndentOverrideDialog.__populateLanguages" ID="EditorLanguageTabIndentOverrideDialog.__populateLanguages"></a> +<h4>EditorLanguageTabIndentOverrideDialog.__populateLanguages</h4> +<b>__populateLanguages</b>(<i>filterLanguages</i>) + +<p> + Private method to populate the language combo boxes. +</p> +<a NAME="EditorLanguageTabIndentOverrideDialog.__updateOkButton" ID="EditorLanguageTabIndentOverrideDialog.__updateOkButton"></a> +<h4>EditorLanguageTabIndentOverrideDialog.__updateOkButton</h4> +<b>__updateOkButton</b>(<i></i>) + +<p> + Private method to set the enabled status of the OK button. +</p> <a NAME="EditorLanguageTabIndentOverrideDialog.getData" ID="EditorLanguageTabIndentOverrideDialog.getData"></a> <h4>EditorLanguageTabIndentOverrideDialog.getData</h4> <b>getData</b>(<i></i>) @@ -154,6 +181,20 @@ selected language </dd> </dl> +<a NAME="EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged" ID="EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged"></a> +<h4>EditorLanguageTabIndentOverrideDialog.on_pygmentsLexerCombo_currentIndexChanged</h4> +<b>on_pygmentsLexerCombo_currentIndexChanged</b>(<i>lang</i>) + +<p> + Private slot to handle the selection of a language. +</p> +<dl> + +<dt><i>lang</i> (str)</dt> +<dd> +selected language +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py Thu Oct 01 17:39:16 2020 +0200 @@ -189,14 +189,10 @@ """ Private slot to add a new override entry. """ - import QScintilla.Lexers - languages = list( - QScintilla.Lexers.getSupportedLanguages().keys()) + languages = [] for row in range(self.languageOverrideWidget.topLevelItemCount()): itm = self.languageOverrideWidget.topLevelItem(row) - language = itm.text(0) - if language in languages: - languages.remove(language) + languages.append(itm.text(0)) dlg = EditorLanguageTabIndentOverrideDialog( editMode=False, languages=languages,
--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Thu Oct 01 17:39:16 2020 +0200 @@ -170,7 +170,7 @@ </column> <column> <property name="text"> - <string notr="true"/> + <string notr="true"> </string> </property> </column> </widget>
--- a/eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py Thu Oct 01 17:39:16 2020 +0200 @@ -8,6 +8,8 @@ a language. """ +from pygments.lexers import get_all_lexers + from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog, QDialogButtonBox @@ -23,6 +25,8 @@ Class implementing a dialog to set the tab and indentation width override for a language. """ + PygmentsMarker = "Pygments|" + def __init__(self, *, editMode=False, languages=None, tabWidth=0, indentWidth=0, parent=None): """ @@ -31,25 +35,49 @@ @keyparam editMode flag indicating the edit mode (Note: in edit mode the language is fixed) @type bool - @keyparam languages list of available languages + @param languages list of existing languages (if in add mode) or + a list containing the language to be edited @type list of str - @keyparam tabWidth tab width to be set + @param tabWidth tab width to be set @type int - @keyparam indentWidth indentation width to be set + @param indentWidth indentation width to be set @type int - @keyparam parent reference to the parent widget + @param parent reference to the parent widget @type QWidget """ super(EditorLanguageTabIndentOverrideDialog, self).__init__(parent) self.setupUi(self) + self.__extras = ["-----------", self.tr("Alternative")] + if editMode: self.languageComboBox.addItems(languages) else: - self.languageComboBox.addItems([""] + sorted(languages)) + self.__populateLanguages(languages) self.tabWidthSpinBox.setValue(tabWidth) self.indentWidthSpinBox.setValue(indentWidth) + def __populateLanguages(self, filterLanguages): + """ + Private method to populate the language combo boxes. + """ + import QScintilla.Lexers + languages = list( + QScintilla.Lexers.getSupportedLanguages().keys()) + for lang in filterLanguages: + if lang in languages: + languages.remove(lang) + self.languageComboBox.addItems( + [""] + sorted(languages) + self.__extras) + + pygmentsLanguages = [lex[0] for lex in get_all_lexers()] + for lang in filterLanguages: + if lang.startswith(self.PygmentsMarker): + lang = lang.replace(self.PygmentsMarker, "") + if lang in pygmentsLanguages: + pygmentsLanguages.remove(lang) + self.pygmentsLexerCombo.addItems([""] + sorted(pygmentsLanguages)) + def getData(self): """ Public method to get the entered data. @@ -58,12 +86,28 @@ indentation width @rtype tuple of (str, int, int) """ + language = self.languageComboBox.currentText() + if language in self.__extras: + pygmentsLanguage = self.pygmentsLexerCombo.currentText() + language = self.PygmentsMarker + pygmentsLanguage return ( - self.languageComboBox.currentText(), + language, self.tabWidthSpinBox.value(), self.indentWidthSpinBox.value(), ) + def __updateOkButton(self): + """ + Private method to set the enabled status of the OK button. + """ + lang = self.languageComboBox.currentText() + if lang in self.__extras: + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + bool(self.pygmentsLexerCombo.currentText())) + else: + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + bool(lang)) + @pyqtSlot(str) def on_languageComboBox_currentIndexChanged(self, lang): """ @@ -72,5 +116,21 @@ @param lang selected language @type str """ - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - bool(lang)) + if lang in self.__extras: + self.pygmentsLexerCombo.setEnabled(True) + self.pygmentsLabel.setEnabled(True) + else: + self.pygmentsLexerCombo.setEnabled(False) + self.pygmentsLabel.setEnabled(False) + + self.__updateOkButton() + + @pyqtSlot(str) + def on_pygmentsLexerCombo_currentIndexChanged(self, lang): + """ + Private slot to handle the selection of a language. + + @param lang selected language + @type str + """ + self.__updateOkButton()
--- a/eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui Thu Oct 01 17:39:16 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>142</height> + <height>145</height> </rect> </property> <property name="windowTitle"> @@ -20,7 +20,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Language:</string> + <string>Lexer Language:</string> </property> </widget> </item> @@ -32,16 +32,33 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="toolTip"> + <string>Select the lexer language to override</string> + </property> </widget> </item> <item row="1" column="0"> + <widget class="QLabel" name="pygmentsLabel"> + <property name="text"> + <string>Alternative Lexer:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QComboBox" name="pygmentsLexerCombo"> + <property name="toolTip"> + <string>Select the alternative lexer to override</string> + </property> + </widget> + </item> + <item row="2" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> <string>Tab Width:</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QSpinBox" name="tabWidthSpinBox"> <property name="toolTip"> <string>Enter the tab width</string> @@ -57,7 +74,7 @@ </property> </widget> </item> - <item row="1" column="2"> + <item row="2" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -70,14 +87,14 @@ </property> </spacer> </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="TextLabel13_2_3"> <property name="text"> <string>Indentation width:</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QSpinBox" name="indentWidthSpinBox"> <property name="toolTip"> <string>Enter the indentation width</string> @@ -93,7 +110,7 @@ </property> </widget> </item> - <item row="2" column="2"> + <item row="3" column="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -106,7 +123,7 @@ </property> </spacer> </item> - <item row="3" column="0" colspan="3"> + <item row="4" column="0" colspan="3"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -120,6 +137,7 @@ </widget> <tabstops> <tabstop>languageComboBox</tabstop> + <tabstop>pygmentsLexerCombo</tabstop> <tabstop>tabWidthSpinBox</tabstop> <tabstop>indentWidthSpinBox</tabstop> </tabstops>
--- a/eric6/i18n/eric6_cs.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_cs.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11203,7 +11203,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -11453,7 +11453,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -11493,237 +11493,237 @@ <translation>Předchozí úloha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Tisk je hotov</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Chyba během tisku</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Chyba během tisku</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Přidat soubory...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -11743,12 +11743,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -11818,7 +11818,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -11828,12 +11828,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -11858,47 +11858,47 @@ <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Soubor <b>{0}</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -11923,27 +11923,27 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11968,27 +11968,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -12013,7 +12013,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> @@ -12028,32 +12028,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12083,12 +12083,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13546,12 +13546,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14045,28 +14045,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation type="unfinished">Jazyk:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Jazyk:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">Šířka odsazení:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">Jazyk lexeru:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Alternativní lexer:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternativa</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -48252,12 +48277,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -90826,12 +90851,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation type="unfinished">Generování hlavního okna...</translation> </message>
--- a/eric6/i18n/eric6_de.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_de.ts Thu Oct 01 17:39:16 2020 +0200 @@ -10883,12 +10883,12 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Datei sichern</translation> </message> @@ -10973,27 +10973,27 @@ <translation>Drucken</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Drucke...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Drucken beendet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Fehler beim Drucken</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Fehler beim Drucken</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -11003,7 +11003,7 @@ <translation>Prüfen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Datei geändert</translation> </message> @@ -11038,12 +11038,12 @@ <translation>Box Kommentar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation> </message> @@ -11058,57 +11058,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -11158,42 +11158,42 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> </message> @@ -11223,7 +11223,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -11233,12 +11233,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -11268,42 +11268,42 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -11343,82 +11343,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Dateien hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Aliased-Datei hinzufügen...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Aliased-Datei hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -11468,12 +11468,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -11548,7 +11548,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -11558,12 +11558,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -11573,12 +11573,12 @@ <translation>Aus dem Wörterbuch entfernen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> @@ -11603,27 +11603,27 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> @@ -11648,27 +11648,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -11693,7 +11693,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> </message> @@ -11708,32 +11708,32 @@ <translation>Vervollständigen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation>Provider für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation> </message> @@ -11763,12 +11763,12 @@ <translation>Auswahl in Konsole ausführen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation>EditorConfig Eigenschaften</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Die EditorConfig Eigenschaften für die Datei <b>{0}</b> konnten nicht geladen werden.</p></translation> </message> @@ -13212,12 +13212,12 @@ <translation>Drücken, um die ausgewählte Sprachen spezifische Änderung zu bearbeiten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation>Tabulator und Einrückung Änderung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation>Sollen die ausgewählten Einträge wirklich gelöscht werden?</translation> </message> @@ -13674,30 +13674,50 @@ <translation>Tabulator und Einrückung Änderung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> - <source>Language:</source> - <translation>Sprache:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation>Tabulatorweite:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation>Gib die Tabulatorweite ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation>Einrückungstiefe:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation>Gib die Einrückungstiefe ein</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation>Programmiersprache:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation>Wähle die zu überschreibende Programmiersprache</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation>Alternativer Lexer:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation>Wähle den zu überschreibenden alternativen Lexer</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation>Alternative</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -45118,12 +45138,12 @@ <translation><b>Kopie speichern</b><p>Speichern einer Kopie des Inhalts des aktuellen Editorfensters. Die Datei kann mit einem Dateiauswahldialog eingegeben werden.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation>EditorConfig Eigenschaften</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Die EditorConfig Eigenschaften für die Datei <b>{0}</b> konnten nicht geladen werden.</p></translation> </message> @@ -87283,12 +87303,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>Starte...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message>
--- a/eric6/i18n/eric6_empty.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_empty.ts Thu Oct 01 17:39:16 2020 +0200 @@ -10775,7 +10775,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -10865,7 +10865,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -11135,7 +11135,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -11250,387 +11250,387 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> - <source>Style: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6599"/> + <source>Style: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11655,12 +11655,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13102,12 +13102,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -13564,30 +13564,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> - <source>Language:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -44882,12 +44902,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -86593,12 +86613,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_en.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_en.ts Thu Oct 01 17:39:16 2020 +0200 @@ -10790,7 +10790,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -10880,7 +10880,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -11105,7 +11105,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -11210,327 +11210,327 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11555,27 +11555,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11600,7 +11600,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -11615,32 +11615,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11670,12 +11670,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13117,12 +13117,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -13579,30 +13579,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> - <source>Language:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -44923,12 +44943,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -86643,12 +86663,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_es.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_es.ts Thu Oct 01 17:39:16 2020 +0200 @@ -10888,7 +10888,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> @@ -11143,7 +11143,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -11193,247 +11193,247 @@ <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Modificación de un archivo de solo lectura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Impresión completa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Error al imprimir</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Error al imprimir</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Añadir archivo con un alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Añadir archivo con un alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -11503,7 +11503,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -11513,12 +11513,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -11543,47 +11543,47 @@ <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>El archivo <b>{0}</b> tiene cambios sin guardar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser abierto.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -11608,27 +11608,27 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> @@ -11653,27 +11653,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -11698,7 +11698,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> @@ -11713,32 +11713,32 @@ <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> @@ -11768,12 +11768,12 @@ <translation>Ejecutar Selección en Consola</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation>Propiedades de EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Las propiedades de EditorConfig para el archivo <b>{0}</b> no se ha podido cargar.</p></translation> </message> @@ -13217,12 +13217,12 @@ <translation>Pulsar para editar la sobreescritura específica de lenguaje seleccionada</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation>Sobreescritura de Tabulación e Indentación</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation>¿Desea eliminar las entradas seleccionadas?</translation> </message> @@ -13681,28 +13681,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation>Lenguaje:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Lenguaje:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation>Ancho de Tabulación:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation>Introducir el ancho de tabulación</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation>Ancho de indentación:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation>Introducir el ancho de indentación</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">Lenguaje de Analizador Léxico:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Analizador Léxico Alternativo:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternativo</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -45141,12 +45166,12 @@ <translation><b>Guardar Copia</b><p>Guardar una copia del contenido de la ventana de editor actual. El archivo puede ser introducido usando un diálogo de selección de archivo.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation>Propiedades de EditorConfig</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Las propiedades de EditorConfig para el archivo <b>{0}</b> no se ha podido cargar.</p></translation> </message> @@ -87284,12 +87309,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>Comenzando...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>Generando Ventana Principal...</translation> </message>
--- a/eric6/i18n/eric6_fr.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_fr.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11308,7 +11308,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -11328,142 +11328,142 @@ <translation>Effacer tous les points d'arrêts</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Modification de la lecture seule</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Le fichier est en lecture seule. Sauvez d'abord votre fichier sous un autre nom.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Impression terminée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Erreur durant l'impression</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Erreur durant l'impression</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Ouvrir Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Enregistrer Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Fichier Modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -11483,7 +11483,7 @@ <translation>Supprimer les flags d'erreurs de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -11493,12 +11493,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -11528,17 +11528,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -11573,72 +11573,72 @@ <translation>Pas de langage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Ajouter un fichier alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Ajouter un fichier alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -11683,12 +11683,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -11758,7 +11758,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -11768,12 +11768,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -11798,47 +11798,47 @@ <translation type="unfinished">Alternatives ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Le fichier <b>{0}</b> a des modifications non enregistrées.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Le fichier <b>{0}</b> ne peut être ouvert.</p><p>Raison : {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Le fichier <b>{0}</b> ne peut être enregistré.<br/>Raison : {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier macro <b>{0}</b> ne peut être lu.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Le fichier macro <b>{0}</b> est corrompu.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Le fichier macro <b>{0}</b> ne peut être écrit.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation type="unfinished">{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> n'est pas un fichier.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -11863,27 +11863,27 @@ <translation>Effacer les alertes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier macro <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Alerte : {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Erreur : {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Alerte :</b> Vous allez perdre vos modifications à la réouverture.</translation> </message> @@ -11908,27 +11908,27 @@ <translation>Modification précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La sélection contient des données illégales pour un tri numérique.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>Pas de message d'alerte disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Style : {0}</translation> </message> @@ -11953,7 +11953,7 @@ <translation>Réouvrir avec encodage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Le fichier <b>{0}</b> a été modifié depuis l'ouverture dans eric6. Le relire ?</p></translation> </message> @@ -11968,32 +11968,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12023,12 +12023,12 @@ <translation>Exécuter la sélection en console</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation>Propriétés d'EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Les propriétés d'EditorConfig du fichier <b>{0}</b> n'ont pas pu être chargées.</p></translation> </message> @@ -13492,12 +13492,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -13986,28 +13986,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation>Langage :</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Langage :</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation>Largeur de tabulation :</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation>Entrer la largeur de tabulation</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation>Largeur des indentations :</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation>Entrer la largeur d'indentation</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">Analyseur syntaxique:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Analyseur alternatif:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternatif</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -47505,12 +47530,12 @@ <translation><b>Enregistrer une copie</b><p>Enregistre une copie du contenu de l'éditeur courant. Le fichier peut être entré dans un sélectionneur de fichiers.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished">Propriétés d'EditorConfig</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"><p>Les propriétés d'EditorConfig du fichier <b>{0}</b> n'ont pas pu être chargées.</p></translation> </message> @@ -90063,12 +90088,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>Démarrage...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>Création de la fenêtre principale...</translation> </message>
--- a/eric6/i18n/eric6_it.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_it.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11569,7 +11569,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -11589,142 +11589,142 @@ <translation>Elimina tutti i breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Modifica di un file di sola lettura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Stai tentando di modificare un file in sola lettura. Per favore prima salva come un file diverso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>In stampa...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Stampa completata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Errore durante la stampa</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Errore durante la stampa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Stampa annullata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Apri File</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>File modificato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -11744,7 +11744,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -11754,12 +11754,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -11789,17 +11789,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -11834,72 +11834,72 @@ <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Aggiungi file...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Aggiungi files...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Aggiungi file sinonimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Aggiungi file sinonimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -11944,12 +11944,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -12019,7 +12019,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -12029,12 +12029,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -12059,47 +12059,47 @@ <translation>Alternative ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Il file <b>{0}</b> contiene modifiche non salvate.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere aperto.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Il file macro <b>{0}</b> è danneggiato.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> @@ -12124,27 +12124,27 @@ <translation>Pulisci warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file delle macro <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Attenzione: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> @@ -12169,27 +12169,27 @@ <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> @@ -12214,7 +12214,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> è stato modificato mentre era aperto in eric6. Rileggerlo ?</p></translation> </message> @@ -12229,32 +12229,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12284,12 +12284,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13748,12 +13748,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14247,28 +14247,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation type="unfinished">Linguaggio:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Linguaggio:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">Larghezza identazione:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Analizzatore sintassi alternatico:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternativo</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -49831,12 +49856,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -92705,12 +92730,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation type="unfinished">Inizio...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation type="unfinished">Generazione Main Window...</translation> </message>
--- a/eric6/i18n/eric6_pt.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_pt.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11407,7 +11407,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Abrir Ficheiro</translation> </message> @@ -11497,7 +11497,7 @@ <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Verificação ortográfica...</translation> </message> @@ -11722,7 +11722,7 @@ <translation>Editar ponto de interrupção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Habilitar pontos de interrupção</translation> </message> @@ -11827,332 +11827,332 @@ <translation>Selecionar o analizador léxico Pygments a aplicar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Modificação do ficheiro de Apenas Leitura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Tenta alterar um ficheiro de Apenas Leitura. Por favor guarde-o primeiro num ficheiro diferente. </translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>A imprimir...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Impressão completa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Erro durante a impressão</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Erro durante a impressão</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Impressão cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Ficheiro Modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>O ficheiro <b>{0}</b> tem alterações por gravar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Não se pôde abrir o ficheiro <b>{0}</b>.</p><p> Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Gravar Ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde gravar. <br/>Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Inabilitar ponto de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Foram cobertas as linhas todas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Dados de Perfil</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Escolha um ficheiro de perfil por favor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Erro de Sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Não está disponível a mensagem de erro de sintaxe.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Nome de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Selecionar um nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Carregar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Ficheiros Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Erro ao carregar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não se pode ler.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>O ficheiro macro <b>{0}</b> está corrompido.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Gravar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro macro <b>{0}</b> já existe. Sobreescrever-lo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Erro ao gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não pode ser escrito.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Iniciar Registo de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>A gravação de macro já está ativada. Começar nova?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Gravação de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Introduza o nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Ficheiro alterado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Adicionar Ficheiro...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Adicionar Ficheiros...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Adicionar ficheiro com pseudónimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Adicionar ficheiro com pseudónimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Adicionar recursos localizado...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Adicionar recurso de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Adicionar recursos de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Adicionar recurso de ficheiro com pseudónimo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Pseudónimo para o ficheiro <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Diagrama do Pacote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Incluir atributos de classes?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Diagrama de Imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Incluir imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Diagrama da Aplicação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Incluir nome dos módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Adicionar dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Ignorar Tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Aviso: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Aviso:</b> Perderá todas as alterações uma vez que o volte a abrir.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> @@ -12177,27 +12177,27 @@ <translation>Alteração anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation>Ordenar Linhas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>Não estão disponíveis mensagens de aviso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -12222,7 +12222,7 @@ <translation>Reabrir Com Codificação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>O ficheiro <b>{0}</b> foi alterado enquanto estava aberto em eric6. Recarregar?</p></translation> </message> @@ -12237,27 +12237,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12287,12 +12287,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13750,12 +13750,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14247,30 +14247,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> - <source>Language:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">Largura da indentação:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">Linguagem de Analizador Léxico:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Analizador Léxico Alternativo:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternativa</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -49310,12 +49330,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -91770,12 +91790,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>A iniciar...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>A criar a Janela Principal...</translation> </message>
--- a/eric6/i18n/eric6_ru.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_ru.ts Thu Oct 01 17:39:16 2020 +0200 @@ -10923,7 +10923,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Открыть файл</translation> </message> @@ -11013,7 +11013,7 @@ <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -11238,7 +11238,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -11343,327 +11343,327 @@ <translation>Выберите для использования лексер Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Редактирование файла, открытого только на чтение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Печать...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Печать завершена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Ошибка печати</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Ошибка печати</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Печать прервана</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Файл изменён</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Автодополнение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Покрытие кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл покрытия</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по покрытию кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Все строки были охвачены.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Нет доступного файла покрытия.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Файл с макросами <b>{0}</b> повреждён.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Макро <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Начать запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Файл изменен</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Добавить файл под другим именем...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Добавить файл под другим именем...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Добавить в словарь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> @@ -11688,27 +11688,27 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation>Сортировать строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation>Нет предупреждающего сообщения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation>Стиль: {0}</translation> </message> @@ -11733,7 +11733,7 @@ <translation>Открыть заново с кодировкой</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в eric6. Перепрочесть?</p></translation> </message> @@ -11748,32 +11748,32 @@ <translation>Дополнить</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation>Источник автодополнений</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Список дополнений источника '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation>Источник всплывающих подсказок</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Источник всплывающих подсказок '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation>Регистрация обработчика кликов мышки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Обработчик кликов мышки для "{0}" уже зарегистрирован "{1}". Запрос прерван "{2}"...</translation> </message> @@ -11803,12 +11803,12 @@ <translation>Выполнить выбор в консоли</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation>Свойства EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Не удается загрузить свойства EditorConfig для файла <b>{0}</b>.</p></translation> </message> @@ -13253,12 +13253,12 @@ <translation>Редактировать выбранное переопределение конкретного языка</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation>Переопределение табуляции и отступа</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation>Действительно ли выбранные записи должны быть удалены?</translation> </message> @@ -13717,28 +13717,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation>Язык:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Язык:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation>Ширина табуляции:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation>Задайте ширину табуляции</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation>Ширина отступа:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation>Задайте ширину отступа</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Альтернативный лексер:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Альтернативный</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -45218,12 +45243,12 @@ <translation><b>Сохранить копию</b><p>Сохранение контента текущего окна редактора. Имя файла может быть введено в диалоге выбора файла.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation>Свойства EditorConfig</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Не удается загрузить свойства EditorConfig для файла <b>{0}</b>.</p></translation> </message> @@ -87532,12 +87557,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message>
--- a/eric6/i18n/eric6_tr.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_tr.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11248,7 +11248,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>Dosya Aç</translation> </message> @@ -11338,7 +11338,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> @@ -11563,7 +11563,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını etkinleştir</translation> </message> @@ -11668,327 +11668,327 @@ <translation>Kullanmak için Pygment lexer seç.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>Yalnızca okunabilir dosyada değişiklik</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Yalnızca okunabilir bir dosyayı değiştirmeşe çalışıyorsunuz. Lütfen önce farklı bir isimde kaydediniz.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>Yazılıyor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>Yazdırma tamalandı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>Yazdırılırken hata</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>Yazdırılırken hata</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>Yazdırma iptal edildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>Dosya Değiştirildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p><b>{0}</b>dosyasında kaydedilmemiş değişiklikler var.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Dosya <b>{0}</b> açılamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Dosya <b>{0}</b> kaydedilemiyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Makro dosyası <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Makro dosyası <b>{0}</b> bozuk.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Makro dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>Dosya ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>Dosyaları ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>Kısaltmalar dosyasına ekle...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>Kısaltmalar dosyasına ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation><b>{0} dosyası için takma ad</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>Dikkat: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Makro dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -12013,27 +12013,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -12058,7 +12058,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Eric5 ile açıldıktan sonra <b>{0}</b> dosyasında değişiklik olmuş. Yeniden açılsın mı?</p> {0}?} {6.?}</translation> </message> @@ -12073,32 +12073,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12128,12 +12128,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13591,12 +13591,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14090,28 +14090,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation type="unfinished">Dil:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">Dil:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">Girinti genişliği:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">Lexer Dili:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished">Alternatif Lexer:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished">Alternatif</translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -48462,12 +48487,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -90885,12 +90910,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation type="unfinished">Anapencere üretiliyor...</translation> </message>
--- a/eric6/i18n/eric6_zh_CN.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11227,7 +11227,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>打开文件</translation> </message> @@ -11312,7 +11312,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> @@ -11532,7 +11532,7 @@ <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -11607,257 +11607,257 @@ <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>试图改变只读文件。请先保存到另一个文件中。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>打印已完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>打印时出错</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>打印时出错</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效,没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>选择一个宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>输入宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>添加别名文件…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>添加别名文件…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>添加本地资源…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>包含类属性?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>包含模块名?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -11882,47 +11882,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>文件 <b>{0}</b> 有未保存的更改。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法打开。</p><p>原因:{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法保存。<br />原因:{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0}(只读)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -11947,27 +11947,27 @@ <translation>清空警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>宏文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>警告:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>错误:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>警告:</b>您在重新打开时将丢失所有更改。</translation> </message> @@ -11992,27 +11992,27 @@ <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -12037,7 +12037,7 @@ <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -12052,32 +12052,32 @@ <translation>补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12107,12 +12107,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13570,12 +13570,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14064,28 +14064,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation type="unfinished">语言:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">语言:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">缩进宽度:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">词法分析器语言:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -49038,12 +49063,12 @@ <translation><b>保存副本</b>保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -91861,12 +91886,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>正在启动…</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>正在产生主窗口…</translation> </message>