Sat, 14 Mar 2015 14:36:52 +0100
Added capability to configure the indentation guides colors.
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py Sat Mar 14 14:29:22 2015 +0100 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.py Sat Mar 14 14:36:52 2015 +0100 @@ -34,8 +34,6 @@ Preferences.getEditor("TabWidth")) self.indentwidthSlider.setValue( Preferences.getEditor("IndentWidth")) - self.indentguidesCheckBox.setChecked( - Preferences.getEditor("IndentationGuides")) self.tabforindentationCheckBox.setChecked( Preferences.getEditor("TabForIndentation")) self.tabindentsCheckBox.setChecked( @@ -64,9 +62,6 @@ "IndentWidth", self.indentwidthSlider.value()) Preferences.setEditor( - "IndentationGuides", - self.indentguidesCheckBox.isChecked()) - Preferences.setEditor( "TabForIndentation", self.tabforindentationCheckBox.isChecked()) Preferences.setEditor(
--- a/Preferences/ConfigurationPages/EditorGeneralPage.ui Sat Mar 14 14:29:22 2015 +0100 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.ui Sat Mar 14 14:36:52 2015 +0100 @@ -10,7 +10,7 @@ <height>593</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -36,7 +36,7 @@ <property name="title"> <string>Tabs && Indentation</string> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <layout class="QGridLayout"> <item row="0" column="0"> @@ -138,14 +138,14 @@ </layout> </item> <item> - <layout class="QGridLayout"> + <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> - <widget class="QCheckBox" name="indentguidesCheckBox"> + <widget class="QCheckBox" name="autoindentCheckBox"> <property name="toolTip"> - <string>Select whether indentation guides should be shown.</string> + <string>Select whether autoindentation shall be enabled</string> </property> <property name="text"> - <string>Show Indentation Guides</string> + <string>Auto indentation</string> </property> </widget> </item> @@ -160,12 +160,12 @@ </widget> </item> <item row="1" column="0"> - <widget class="QCheckBox" name="autoindentCheckBox"> + <widget class="QCheckBox" name="tabindentsCheckBox"> <property name="toolTip"> - <string>Select whether autoindentation shall be enabled</string> + <string>Select whether pressing the tab key indents.</string> </property> <property name="text"> - <string>Auto indentation</string> + <string>Tab key indents</string> </property> </widget> </item> @@ -179,16 +179,6 @@ </property> </widget> </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="tabindentsCheckBox"> - <property name="toolTip"> - <string>Select whether pressing the tab key indents.</string> - </property> - <property name="text"> - <string>Tab key indents</string> - </property> - </widget> - </item> </layout> </item> </layout> @@ -273,7 +263,6 @@ <tabstops> <tabstop>tabwidthSlider</tabstop> <tabstop>indentwidthSlider</tabstop> - <tabstop>indentguidesCheckBox</tabstop> <tabstop>autoindentCheckBox</tabstop> <tabstop>tabindentsCheckBox</tabstop> <tabstop>tabforindentationCheckBox</tabstop>
--- a/Preferences/ConfigurationPages/EditorStylesPage.py Sat Mar 14 14:29:22 2015 +0100 +++ b/Preferences/ConfigurationPages/EditorStylesPage.py Sat Mar 14 14:36:52 2015 +0100 @@ -24,8 +24,6 @@ """ Class implementing the Editor Styles configuration page. """ - # TODO: configure foreground and background of indentation guides - # setIndentationGuidesBackgroundColor, setIndentationGuidesForegroundColor def __init__(self): """ Constructor @@ -244,6 +242,15 @@ self.initColour("MarkerMapBackground", self.markerMapBackgroundButton, Preferences.getEditorColour) + + self.indentguidesCheckBox.setChecked( + Preferences.getEditor("IndentationGuides")) + self.initColour("IndentationGuidesBackground", + self.indentationGuidesBackgroundButton, + Preferences.getEditorColour) + self.initColour("IndentationGuidesForeground", + self.indentationGuidesForegroundButton, + Preferences.getEditorColour) def save(self): """ @@ -323,6 +330,10 @@ "OnlineChangeTraceInterval", self.changeTraceTimeoutSpinBox.value()) + Preferences.setEditor( + "IndentationGuides", + self.indentguidesCheckBox.isChecked()) + self.saveColours(Preferences.setEditorColour) for key in list(self.editorColours.keys()): Preferences.setEditorColour(key, self.editorColours[key])
--- a/Preferences/ConfigurationPages/EditorStylesPage.ui Sat Mar 14 14:29:22 2015 +0100 +++ b/Preferences/ConfigurationPages/EditorStylesPage.ui Sat Mar 14 14:36:52 2015 +0100 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>591</width> - <height>2019</height> + <height>2146</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout_7"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -1537,21 +1537,71 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_10"> + <widget class="QGroupBox" name="groupBox_15"> <property name="title"> - <string>Various</string> + <string>Indentation Guides</string> </property> - <layout class="QGridLayout" name="_14"> - <item row="0" column="0"> - <widget class="QCheckBox" name="miniMenuCheckBox"> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QCheckBox" name="indentguidesCheckBox"> <property name="toolTip"> - <string>Select to show a minimalistic context menu</string> + <string>Select whether indentation guides should be shown.</string> </property> <property name="text"> - <string>Show minimal context menu</string> + <string>Show Indentation Guides</string> </property> </widget> </item> + <item> + <layout class="QHBoxLayout" name="_18"> + <item> + <widget class="QLabel" name="TextLabel2_2_2_2_2_13"> + <property name="text"> + <string>Indentation Guides foreground:</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="indentationGuidesForegroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the foreground colour for indentation guides</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel2_2_2_2_2_14"> + <property name="text"> + <string>Indentation Guides background:</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="indentationGuidesBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background colour for indentation guides</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> </item> @@ -1772,6 +1822,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_10"> + <property name="title"> + <string>Various</string> + </property> + <layout class="QGridLayout" name="_14"> + <item row="0" column="0"> + <widget class="QCheckBox" name="miniMenuCheckBox"> + <property name="toolTip"> + <string>Select to show a minimalistic context menu</string> + </property> + <property name="text"> + <string>Show minimal context menu</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -1842,6 +1911,18 @@ <tabstop>whitespaceSizeSpinBox</tabstop> <tabstop>whitespaceForegroundButton</tabstop> <tabstop>whitespaceBackgroundButton</tabstop> + <tabstop>indentguidesCheckBox</tabstop> + <tabstop>indentationGuidesForegroundButton</tabstop> + <tabstop>indentationGuidesBackgroundButton</tabstop> + <tabstop>errorsMapButton</tabstop> + <tabstop>warningsMapButton</tabstop> + <tabstop>bookmarksMapButton</tabstop> + <tabstop>breakpointsMapButton</tabstop> + <tabstop>tasksMapButton</tabstop> + <tabstop>changesMapButton</tabstop> + <tabstop>coverageMapButton</tabstop> + <tabstop>currentMapButton</tabstop> + <tabstop>markerMapBackgroundButton</tabstop> <tabstop>miniMenuCheckBox</tabstop> </tabstops> <resources/>
--- a/Preferences/__init__.py Sat Mar 14 14:29:22 2015 +0100 +++ b/Preferences/__init__.py Sat Mar 14 14:36:52 2015 +0100 @@ -605,6 +605,8 @@ "WhitespaceBackground": QColor(Qt.white), "OnlineChangeTraceMarkerUnsaved": QColor("#ff8888"), "OnlineChangeTraceMarkerSaved": QColor("#88ff88"), + "IndentationGuidesBackground": QColor(Qt.white), + "IndentationGuidesForeground": QColor(Qt.black), # colors for the marker map "BookmarksMap": QColor("#f8c700"), "ErrorsMap": QColor("#dd0000"),
--- a/QScintilla/Editor.py Sat Mar 14 14:29:22 2015 +0100 +++ b/QScintilla/Editor.py Sat Mar 14 14:36:52 2015 +0100 @@ -4114,6 +4114,10 @@ self.setTabIndents(Preferences.getEditor("TabIndents")) self.setBackspaceUnindents(Preferences.getEditor("TabIndents")) self.setIndentationGuides(Preferences.getEditor("IndentationGuides")) + self.setIndentationGuidesBackgroundColor( + Preferences.getEditorColour("IndentationGuidesBackground")) + self.setIndentationGuidesForegroundColor( + Preferences.getEditorColour("IndentationGuidesForeground")) if Preferences.getEditor("ShowWhitespace"): self.setWhitespaceVisibility(QsciScintilla.WsVisible) try:
--- a/QScintilla/MiniEditor.py Sat Mar 14 14:29:22 2015 +0100 +++ b/QScintilla/MiniEditor.py Sat Mar 14 14:36:52 2015 +0100 @@ -2404,6 +2404,10 @@ Preferences.getEditor("TabIndents")) self.__textEdit.setIndentationGuides( Preferences.getEditor("IndentationGuides")) + self.__textEdit.setIndentationGuidesBackgroundColor( + Preferences.getEditorColour("IndentationGuidesBackground")) + self.__textEdit.setIndentationGuidesForegroundColor( + Preferences.getEditorColour("IndentationGuidesForeground")) if Preferences.getEditor("ShowWhitespace"): self.__textEdit.setWhitespaceVisibility(QsciScintilla.WsVisible) try:
--- a/changelog Sat Mar 14 14:29:22 2015 +0100 +++ b/changelog Sat Mar 14 14:36:52 2015 +0100 @@ -5,6 +5,8 @@ - General -- added a configuration page to edit the list of mime types to be opened in an eric editor +- Editor + -- added capability to configure the indentation guides colors - Log Viewer -- added a message filter including a configuration page - Previewers
--- a/i18n/eric6_cs.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_cs.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8598,7 +8598,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -8858,7 +8858,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -8908,237 +8908,237 @@ <translation>LMB přepínač breakpointů</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Tisk je hotov</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Chyba během tisku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <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="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <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="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -9158,12 +9158,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -9238,7 +9238,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -9248,12 +9248,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -9278,47 +9278,47 @@ <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <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="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -9343,47 +9343,47 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9408,27 +9408,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9453,7 +9453,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10394,24 +10394,24 @@ <translation>Zobrazuje vybranou šířku tabulátoru.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether autoindentation shall be enabled</source> <translation>Vybrat, má-li být zapnuto automatické odsazování</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Automatické odsazování</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Vybrat, jestliže se mají zobrazovat vodítka odsazování.</translation> + <translation type="obsolete">Vybrat, jestliže se mají zobrazovat vodítka odsazování.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Zobrazit vodítka odsazování</translation> + <translation type="obsolete">Zobrazit vodítka odsazování</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="175"/> @@ -10434,12 +10434,12 @@ <translation>Používat tabulátory pro odsazování</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Vybrat, má-li stisknutí tabulátoru odsazovat.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> <source>Tab key indents</source> <translation>Tabulátor odsazuje</translation> </message> @@ -10449,52 +10449,52 @@ <translation>Taby && Odsazování</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Komentáře</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Vybrat pro vložení značky komentáře do sloupce 0</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Vložit komentář do sloupce 0</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> + <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> + <translation><b>Vložit komentář do sloupce 0</b><p>Vybrat pro vložení značky komentáře do sloupce 0. Jinak je značka komentáře vložena na první neprázdnou pozici.</p></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Vložit komentář do sloupce 0</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> - <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> - <translation><b>Vložit komentář do sloupce 0</b><p>Vybrat pro vložení značky komentáře do sloupce 0. Jinak je značka komentáře vložena na první neprázdnou pozici.</p></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> + <source>Select to allow the cursor to be moved into virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation type="unfinished"></translation> </message> @@ -12048,7 +12048,7 @@ <translation>Změnit barvu pozadí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Různé</translation> </message> @@ -12063,12 +12063,12 @@ <translation>Zobrazit prázdné znaky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Vybrat pro zobrazení minimalistického kontextového menu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Zobrazit minimální kontextové menu</translation> </message> @@ -12413,100 +12413,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation type="unfinished">Chyby:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Vybrat, jestliže se mají zobrazovat vodítka odsazování.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Zobrazit vodítka odsazování</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32605,7 +32640,7 @@ <translation>Soubor načten</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Beze jména</translation> </message> @@ -32615,22 +32650,22 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Vybrat vše</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Zrušit celý výběr</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Jazyky</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Žádný jazyk</translation> </message> @@ -32717,22 +32752,22 @@ <translation>Tisk aktuálního souboru</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Tisk je hotov</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Chyba během tisku</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> @@ -32757,22 +32792,22 @@ <translation><b>Náhkled tisku</b><p>Náhkled tisku aktuálního souboru.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Odhadem</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternativy</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Pygments Lexer</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Použít Pygments lexer.</translation> </message> @@ -32807,7 +32842,7 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Alternativy ({0})</translation> </message> @@ -35496,27 +35531,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62141,12 +62176,6 @@ <translation>&Rychlé tipy</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1335"/> - <source>Alt+Space</source> - <comment>Edit|Calltip</comment> - <translation></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> <source>Show Calltips</source> <translation>Zobrazit Rychlé tipy</translation> @@ -63155,6 +63184,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_de.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_de.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8620,12 +8620,12 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Datei sichern</translation> </message> @@ -8710,27 +8710,27 @@ <translation>Drucken</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Drucke...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Drucken beendet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Fehler beim Drucken</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -8740,7 +8740,7 @@ <translation>Prüfen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Datei geändert</translation> </message> @@ -8775,12 +8775,12 @@ <translation>Box Kommentar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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> @@ -8795,57 +8795,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -8905,42 +8905,42 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <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="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <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="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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> @@ -8970,7 +8970,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -8980,12 +8980,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -9015,42 +9015,42 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -9090,82 +9090,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Dateien hinzufügen...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Aliased-Datei hinzufügen...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Dateien hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Aliased-Datei hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <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="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -9215,12 +9215,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -9300,7 +9300,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -9310,12 +9310,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -9325,12 +9325,12 @@ <translation>Aus dem Wörterbuch entfernen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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> @@ -9355,47 +9355,47 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation>Aktivierung eines Providers für Calltips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> @@ -9420,27 +9420,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <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="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -9465,7 +9465,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10391,22 +10391,22 @@ <translation>Tabulatoren beim Öffnen umwandeln</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Wähle aus, ob das Drücken der Tabulatortaste einrücken soll.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> - <source>Tab key indents</source> - <translation>Tabulatortaste rückt ein</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> - <source>Select whether autoindentation shall be enabled</source> - <translation>Wähle aus, ob die automatische Einrückung aktiv sein soll</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <source>Tab key indents</source> + <translation>Tabulatortaste rückt ein</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> + <source>Select whether autoindentation shall be enabled</source> + <translation>Wähle aus, ob die automatische Einrückung aktiv sein soll</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Automatische Einrückung</translation> </message> @@ -10421,16 +10421,6 @@ <translation>Benutze Tabulatoren zum Einrücken</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> - <source>Select whether indentation guides should be shown.</source> - <translation>Wähle aus, ob Einrückungsmarkierungen angezeigt werden sollen.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> - <source>Show Indentation Guides</source> - <translation>Zeige Einrückungsmarkierungen</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="17"/> <source><b>Configure general editor settings</b></source> <translation><b>Allgemeine Editoreinstellungen</b></translation> @@ -10441,52 +10431,52 @@ <translation>Tabulatoren && Einrückung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Kommentare</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Auswählen, um das Kommentarzeichen in Spalte 0 einzufügen</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Kommentarzeichen in Spalte 0 einfügen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> + <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> + <translation><b>Kommentarzeichen in Spalte 0 einfügen</b><p>Auswählen, um das Kommentarzeichen in Spalte 0 einzufügen. Ansonsten wird das Kommentarzeichen an der ersten Stelle, die kein Leerzeichen ist, eingefügt.</p></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Kommentarzeichen in Spalte 0 einfügen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> - <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> - <translation><b>Kommentarzeichen in Spalte 0 einfügen</b><p>Auswählen, um das Kommentarzeichen in Spalte 0 einzufügen. Ansonsten wird das Kommentarzeichen an der ersten Stelle, die kein Leerzeichen ist, eingefügt.</p></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation>Virtueller Bereich</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation>Der virtuelle Bereich ist der Bereich nach dem letzten Zeichen einer Zeile. Hierfür wird erst Platz allokiert, wenn Text eingegeben oder hineinkopiert wird. Die Verwendung des virtuellen Bereiches kann mit diesen Optionen konfiguriert werden.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> - <translation>Der virtuelle Bereich ist der Bereich nach dem letzten Zeichen einer Zeile. Hierfür wird erst Platz allokiert, wenn Text eingegeben oder hineinkopiert wird. Die Verwendung des virtuellen Bereiches kann mit diesen Optionen konfiguriert werden.</translation> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation>Auswählen, um zuzulassen, dass eine rechteckigen Auswahl bis in den virtuellen Bereich ausgedehnt wird</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> + <translation>Auswahl in den virtuellen Bereich erweitern</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> - <translation>Auswählen, um zuzulassen, dass eine rechteckigen Auswahl bis in den virtuellen Bereich ausgedehnt wird</translation> + <source>Select to allow the cursor to be moved into virtual space</source> + <translation>Auswählen, um zuzulassen, dass die Einfügemarke in den virtuellen Bereich bewegt wird</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation>Auswahl in den virtuellen Bereich erweitern</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation>Auswählen, um zuzulassen, dass die Einfügemarke in den virtuellen Bereich bewegt wird</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation>Einfügemarke in den virtuellen Bereich bewegen</translation> </message> @@ -12040,7 +12030,7 @@ <translation>Ändere Hintergrundfarbe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Verschiedenes</translation> </message> @@ -12055,12 +12045,12 @@ <translation>Zeige Leerzeichen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Auswählen, um ein minimales Kontextmenü anzuzeigen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Zeige minimales Kontextmenü</translation> </message> @@ -12405,100 +12395,135 @@ <translation>Aktuelle Zeile immer hervorheben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation>Markierungenübersicht</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation>Fehler:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation>Wähle die Farbe für Fehlermarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation>Warnungen:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation>Wähle die Farbe für Warnungsmarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation>Wähle die Farbe für Lesezeichenmarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation>Haltepunkte:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation>Wähle die Farbe für Haltepunktemarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation>Aufgaben:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation>Wähle die Farbe für Aufgabenmarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation>Änderungen:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation>Wähle die Farbe für Änderungsmarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation>Abdeckung:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation>Wähle die Farbe für Abdeckungsmarkierungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation>Aktuelle Zeile:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation>Wähle die Farbe der Markierung für die aktuelle Zeile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation>Hintergrund:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation>Wähle die Hintergrundfarbe der Markierungsübersicht</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation>Einrückungsmarkierungen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation>Wähle aus, ob Einrückungsmarkierungen angezeigt werden sollen.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation>Zeige Einrückungsmarkierungen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation>Einrückungsmarkierungenvordergrund:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation>Wähle die Vordergrundfarbe der Einrückungsmarkierungen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation>Einrückungsmarkierungenhintergrund:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation>Wähle die Hintergrundfarbe der Einrückungsmarkierungen</translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32571,7 +32596,7 @@ <translation>Datei geladen</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Unbenannt</translation> </message> @@ -32586,22 +32611,22 @@ <translation>Mini Editor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Auswahl aufheben</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Sprachen</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Keine Sprache</translation> </message> @@ -32688,22 +32713,22 @@ <translation>Druckt die aktuelle Datei</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>Drucke...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Drucken beendet</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Fehler beim Drucken</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Drucken abgebrochen</translation> </message> @@ -32728,27 +32753,27 @@ <translation><b>Druckvorschau</b><p>Zeift eine Druckvorschau der aktuellen Datei.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Ermittelt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternativen</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Alternativen ({0})</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Pygments Lexer</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> @@ -35469,27 +35494,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation>Wähle den Python{0}-Interpreter</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation> </message> @@ -62192,12 +62217,6 @@ <translation>&Calltip</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1335"/> - <source>Alt+Space</source> - <comment>Edit|Calltip</comment> - <translation>Alt+Space</translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> <source>Show Calltips</source> <translation>Calltips anzeigen</translation> @@ -63201,6 +63220,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation><b>Vervollständigung vom Dokument und von APIs</b><p>Vervollständigt das Wort, das den Cursor enthält, vom Dokument und von APIs.</p></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation>Meta+Alt+Space</translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_en.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_en.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8534,7 +8534,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -8624,7 +8624,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -8854,7 +8854,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -8969,347 +8969,347 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9334,27 +9334,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9379,7 +9379,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10304,16 +10304,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> - <source>Select whether indentation guides should be shown.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> - <source>Show Indentation Guides</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="155"/> <source>Select whether tab characters are used for indentations.</source> <translation type="unfinished"></translation> @@ -10324,12 +10314,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether autoindentation shall be enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation type="unfinished"></translation> </message> @@ -10344,62 +10334,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> <source>Tab key indents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> + <source>Select to allow the cursor to be moved into virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation type="unfinished"></translation> </message> @@ -12048,7 +12038,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation type="unfinished"></translation> </message> @@ -12063,12 +12053,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation type="unfinished"></translation> </message> @@ -12318,100 +12308,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32545,7 +32570,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation type="unfinished"></translation> </message> @@ -32560,67 +32585,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation type="unfinished"></translation> </message> @@ -35302,27 +35327,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -60235,12 +60260,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1335"/> - <source>Alt+Space</source> - <comment>Edit|Calltip</comment> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> <source>Show Calltips</source> <translation type="unfinished"></translation> @@ -62643,6 +62662,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_es.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_es.ts Sat Mar 14 14:36:52 2015 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="es"> +<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1906,8 +1905,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="151"/> @@ -1980,8 +1979,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="104"/> @@ -8618,7 +8617,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> @@ -8873,7 +8872,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -8933,247 +8932,247 @@ <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Impresión completa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Error al imprimir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <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="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <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="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Añadir archivos...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Añadir archivo con un alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Añadir archivos...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Añadir archivo con un alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -9248,7 +9247,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -9258,12 +9257,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9288,47 +9287,47 @@ <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <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="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -9353,47 +9352,47 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de autocompletado no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de calltip no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> @@ -9418,27 +9417,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <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="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9463,7 +9462,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10384,24 +10383,24 @@ <translation>Muestra el ancho de tabulación seleccionado.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether autoindentation shall be enabled</source> <translation>Seleccionar si el ancho de autoindentación debe ser habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Autoindentación</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Seleccionar si las guias de indentación deben ser mostradas.</translation> + <translation type="obsolete">Seleccionar si las guias de indentación deben ser mostradas.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Mostrar Guías de Indentación</translation> + <translation type="obsolete">Mostrar Guías de Indentación</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="175"/> @@ -10424,12 +10423,12 @@ <translation>Utilizar tabulaciones para indentar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Seleccionar si la pulsación de la tecla de tabulación indenta.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> <source>Tab key indents</source> <translation>Tecla de tabulación indenta</translation> </message> @@ -10439,52 +10438,52 @@ <translation>Tabulación && Indentación</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Comentarios</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Seleccionar para insertar el signo de comentario en la columna 0</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Insertar comentario en la columna 0</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> + <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> + <translation><b>Insertar comentario en la columna 0</b><p>Seleccionar para insertar el signo de comentario en la columna 0. De otro modo, el signo de comentario se inserta en la primera posición de no espacio en blanco.</p></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Insertar comentario en la columna 0</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> - <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> - <translation><b>Insertar comentario en la columna 0</b><p>Seleccionar para insertar el signo de comentario en la columna 0. De otro modo, el signo de comentario se inserta en la primera posición de no espacio en blanco.</p></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation>Espacio Virtual</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation>Espacio virtual es el espacio detrás del último carácter en una línea. No es reservado a menos que se introduzca o se copie algún texto en él. El uso del espacio virtual puede ser configurado con estas selecciones.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> - <translation>Espacio virtual es el espacio detrás del último carácter en una línea. No es reservado a menos que se introduzca o se copie algún texto en él. El uso del espacio virtual puede ser configurado con estas selecciones.</translation> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation>Seleccionar para habilitar una selección rectangular para extender en el espacio virtual</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> + <translation>La selección puede acceder el espacio virtual</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> - <translation>Seleccionar para habilitar una selección rectangular para extender en el espacio virtual</translation> + <source>Select to allow the cursor to be moved into virtual space</source> + <translation>Seleccionar para permitir al cursor moverse dentro del espacio virtual</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation>La selección puede acceder el espacio virtual</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation>Seleccionar para permitir al cursor moverse dentro del espacio virtual</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation>El cursor se puede mover dentro del espacio virtual</translation> </message> @@ -12048,7 +12047,7 @@ <translation>Cambiar color de fondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Varios</translation> </message> @@ -12063,12 +12062,12 @@ <translation>Mostrar espacios en blanco</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Seleccionar mostrar un menú de contexto minimalista</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Mostrar menú de contexto minimalista</translation> </message> @@ -12413,100 +12412,135 @@ <translation>Línea del cursor siempre visible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation>Mapa de marcas de color</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation>Errores:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation>Seleccionar el color para la marca de color para errores</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation>Advertencias:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation>Seleccionar el color para la marca de color para advertencias</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation>Marcadores:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation>Seleccionar el color para la marca de color para marcadores</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation>Puntos de interrupción (Breakpoints):</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation>Seleccionar el color para la marca de color para breakpoints</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation>Tareas:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation>Seleccionar el color para la marca de color para tareas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation>Cambios:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation>Seleccionar el color para la marca de color para cambios</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation>Cobertura:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation>Seleccionar el color para la marca de color para cobertura</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation>Línea Actual:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation>Seleccionar el color para la marca de color de línea actual</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation>Fondo:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation>Seleccionar el color de fondo para el mapa de marcas de color</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Seleccionar si las guias de indentación deben ser mostradas.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Mostrar Guías de Indentación</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -15640,7 +15674,7 @@ <name>HelpBrowser</name> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1094"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Abrir enlace en Nueva Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> @@ -32630,7 +32664,7 @@ <translation>Archivo guardado</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Sin título</translation> </message> @@ -32640,22 +32674,22 @@ <translation>Mini Editor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Deseleccionar todo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Lenguajes</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Ningún Lenguaje</translation> </message> @@ -32686,22 +32720,22 @@ <translation>Imprime el archivo actual</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Impresión completa</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Error mientras se imprimía</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> @@ -32726,22 +32760,22 @@ <translation><b>Presentación Preliminar</b><p>Presentación preliminar del texto de ayuda mostrado.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Suposición</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternativas</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Analizador Léxico de Pygments</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Seleccionar el Analizador Léxico de Pygments a aplicar.</translation> </message> @@ -32776,7 +32810,7 @@ <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Alternativas ({0})</translation> </message> @@ -35471,27 +35505,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation>Seleccionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation> </message>
--- a/i18n/eric6_fr.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_fr.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8774,7 +8774,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -8804,142 +8804,142 @@ <translation>Le click principal place les points d'arrêts</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Modification de la lecture seule</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Impression terminée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Erreur durant l'impression</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Ouvrir Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Enregistrer Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Fichier Modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -8959,7 +8959,7 @@ <translation>Supprimer les flags d'erreurs de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -8969,12 +8969,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -9004,17 +9004,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -9049,72 +9049,72 @@ <translation>Pas de langage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Ajouter des fichiers...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Ajouter un fichier alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Ajouter des fichiers...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Ajouter un fichier alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <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> @@ -9164,12 +9164,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -9244,7 +9244,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -9254,12 +9254,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -9284,47 +9284,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b> a des modifications non enregistrées. </p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -9349,47 +9349,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9414,27 +9414,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9459,7 +9459,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10415,22 +10415,22 @@ <translation>Convertir les tabulations à l'ouverture du fichier</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Indique si la touche "Tab" effectue une indentation.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> - <source>Tab key indents</source> - <translation>Indentation avec la touche "Tab"</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> - <source>Select whether autoindentation shall be enabled</source> - <translation>Sélectionne si l'autoindentation doit être activée</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <source>Tab key indents</source> + <translation>Indentation avec la touche "Tab"</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> + <source>Select whether autoindentation shall be enabled</source> + <translation>Sélectionne si l'autoindentation doit être activée</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Auto indentation</translation> </message> @@ -10447,12 +10447,12 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Indique si les traits donnant l'alignement des indentations doivent être affichés.</translation> + <translation type="obsolete">Indique si les traits donnant l'alignement des indentations doivent être affichés.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Afficher les alignements d'indentation</translation> + <translation type="obsolete">Afficher les alignements d'indentation</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="17"/> @@ -10465,52 +10465,52 @@ <translation>Tabulations && Indentation</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation type="unfinished">Commentaires</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> + <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> - <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> + <source>Select to allow the cursor to be moved into virtual space</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation type="unfinished"></translation> </message> @@ -12075,7 +12075,7 @@ <translation>Changement de la couleur de fond</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Divers</translation> </message> @@ -12090,12 +12090,12 @@ <translation>Affiche explicitement les espaces</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Cocher pour utiliser un menu contextuel réduit</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Afficher un menu contextuel minimal</translation> </message> @@ -12440,100 +12440,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation type="unfinished">Erreurs:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Indique si les traits donnant l'alignement des indentations doivent être affichés.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Afficher les alignements d'indentation</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32618,7 +32653,7 @@ <translation>Fichier chargé</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>SansTitre</translation> </message> @@ -32628,22 +32663,22 @@ <translation>Mini éditeur</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Tout déselectionner</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Langages</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Pas de langage</translation> </message> @@ -32730,22 +32765,22 @@ <translation>Imprime le fichier courant</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Impression terminée</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Erreur durant l'impression</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> @@ -32770,22 +32805,22 @@ <translation><b>Aperçu avant impression</b><p>Aperçu avant impression du fichier courant.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Suggestion</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternatives</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Analyseur Pygments</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> @@ -32820,7 +32855,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> @@ -35508,27 +35543,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62168,7 +62203,7 @@ <location filename="../ViewManager/ViewManager.py" line="1335"/> <source>Alt+Space</source> <comment>Edit|Calltip</comment> - <translation>Alt+Space</translation> + <translation type="obsolete">Alt+Space</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> @@ -63236,6 +63271,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_it.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_it.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8820,7 +8820,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -8850,142 +8850,142 @@ <translation>Toggle Breakpoint LMB</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Modifica di un file di sola lettura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>In stampa...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Stampa completata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Errore durante la stampa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Stampa annullata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Apri File</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>File modificato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <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="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <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="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -9005,7 +9005,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -9015,12 +9015,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -9050,17 +9050,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -9095,72 +9095,72 @@ <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Aggiungi file...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Aggiungi files...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Aggiungi file sinonimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Aggiungi files...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Aggiungi file sinonimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -9210,12 +9210,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -9290,7 +9290,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -9300,12 +9300,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -9330,47 +9330,47 @@ <translation>Alternative ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <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="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> @@ -9395,47 +9395,47 @@ <translation>Pulisci warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation>Attenzione: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation>Fornitore Autocompletamento in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation>Fornitore CallTip in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> @@ -9460,27 +9460,27 @@ <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <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="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> @@ -9505,7 +9505,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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 eric5. Rileggerlo ?</p> {0}?} {6.?}</translation> </message> @@ -10452,22 +10452,22 @@ <translation>Converti tab all'apertura</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Seleziona nel caso la pressione del tasto tab indenti.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> - <source>Tab key indents</source> - <translation>Indentazione tasto Tab</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> - <source>Select whether autoindentation shall be enabled</source> - <translation>Seleziona nel caso l'indentazione automatica debba essere abilitata</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <source>Tab key indents</source> + <translation>Indentazione tasto Tab</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> + <source>Select whether autoindentation shall be enabled</source> + <translation>Seleziona nel caso l'indentazione automatica debba essere abilitata</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Indentazione automatica</translation> </message> @@ -10484,12 +10484,12 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Seleziona nel caso le guide di indentazione debbano essere mostrate.</translation> + <translation type="obsolete">Seleziona nel caso le guide di indentazione debbano essere mostrate.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Mostra guide indentazione</translation> + <translation type="obsolete">Mostra guide indentazione</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="17"/> @@ -10502,52 +10502,52 @@ <translation>Tabs && Identazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Commenti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Seleziona per inserire il segno di commento alla colonna 0</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> <translation><b>Inserisci commento alla colonna 0</b><p>Selezione per inserire il segno di commento allal colonna 0. In alternativa, il segno di commento viene inserito nella posizione del primo carattare non spazio.</p></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Inserisci commento alla colonna 0</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Inserisci commento alla colonna 0</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation>Spazio Virtuale</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation>Lo spazio Virtuale è lo spazio dopo l'ultimo carattere della riga. Non viene allocato fintantochè del testo non viene inserito o copiato in esso. L'uso dello Spazio Virtuale può venir configurato da questa selezione.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> - <translation>Lo spazio Virtuale è lo spazio dopo l'ultimo carattere della riga. Non viene allocato fintantochè del testo non viene inserito o copiato in esso. L'uso dello Spazio Virtuale può venir configurato da questa selezione.</translation> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation>Seleziona per abilitare una selezione rettangolare ad estendersi nello Spazio Virtuale</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> + <translation>Seleziona per abilitare lo Spazio Virtuale</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> - <translation>Seleziona per abilitare una selezione rettangolare ad estendersi nello Spazio Virtuale</translation> + <source>Select to allow the cursor to be moved into virtual space</source> + <translation>Seleziona per permette al cursore di muoversi nello Spazio Virtuale</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation>Seleziona per abilitare lo Spazio Virtuale</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation>Seleziona per permette al cursore di muoversi nello Spazio Virtuale</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation>Il cursore può muoversi nello Spazio Virtuale</translation> </message> @@ -12111,7 +12111,7 @@ <translation>Cambia colore di sfondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Vari</translation> </message> @@ -12126,12 +12126,12 @@ <translation>Mostra spazi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Seleziona per mostrare un menù di contesto minimale</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Mostra menù di contesto minimale</translation> </message> @@ -12476,100 +12476,135 @@ <translation>Linea di omissione sempre visibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation type="unfinished">Errori:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Seleziona nel caso le guide di indentazione debbano essere mostrate.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Mostra guide indentazione</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32697,7 +32732,7 @@ <translation>File caricato</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Senza titolo</translation> </message> @@ -32707,22 +32742,22 @@ <translation>Mini Editor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Seleziona tutti</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Deseleziona tutti</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Linguaggi</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Nessun linguaggio</translation> </message> @@ -32809,22 +32844,22 @@ <translation>Stampa il file corrente</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>In stampa...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Stampa completata</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Errore durante la stampa</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Stampa interrota</translation> </message> @@ -32849,22 +32884,22 @@ <translation><b>Anteprima di stampa</b><p>Anteprima di stampa del file corrente.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Indovinato</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternativo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Analizzatore lessicale Pygments</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> @@ -32899,7 +32934,7 @@ <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Alternative ({0})</translation> </message> @@ -35594,27 +35629,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62257,7 +62292,7 @@ <location filename="../ViewManager/ViewManager.py" line="1335"/> <source>Alt+Space</source> <comment>Edit|Calltip</comment> - <translation>Alt+Space</translation> + <translation type="obsolete">Alt+Space</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> @@ -63324,6 +63359,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_pt.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_pt.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8614,7 +8614,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Abrir Ficheiro</translation> </message> @@ -8704,7 +8704,7 @@ <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Verificação ortográfica...</translation> </message> @@ -8944,7 +8944,7 @@ <translation>Editar ponto de interrupção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Habilitar pontos de interrupção</translation> </message> @@ -9059,347 +9059,347 @@ <translation>Selecionar o analizador léxico Pygments a aplicar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Modificação do ficheiro de Apenas Leitura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>A imprimir...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Impressão completa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Erro durante a impressão</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Impressão cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Ficheiro Modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Gravar Ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Inabilitar ponto de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Foram cobertas as linhas todas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Dados de Perfil</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Escolha um ficheiro de perfil por favor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Erro de Sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <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="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Nome de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Selecionar um nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Carregar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Ficheiros Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Erro ao carregar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Gravar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Erro ao gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Iniciar Registo de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <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="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Gravação de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Introduza o nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Ficheiro alterado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <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="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Adicionar Ficheiro...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Adicionar Ficheiros...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Adicionar ficheiro com pseudónimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Adicionar Ficheiros...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Adicionar ficheiro com pseudónimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Adicionar recursos localizado...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Adicionar recurso de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Adicionar recursos de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Adicionar recurso de ficheiro com pseudónimo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <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="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Diagrama do Pacote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Incluir atributos de classes?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Diagrama de Imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Incluir imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Diagrama da Aplicação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Incluir nome dos módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Adicionar dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Ignorar Tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation>Aviso: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <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="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation>A ativar o Fornecedor de Preenchimento Automático</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Não se pode conetar o fornecedor de autocompletar porque já há outro ativo. Por favor verifique a sua configuração.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation>A ativar Fornecedor de Dicas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>O fornecedor de dicas não pode ser conetado porque já há outro activado. Por favor verifique a sua configuração.</translation> </message> @@ -9424,27 +9424,27 @@ <translation>Alteração anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation>Ordenar Linhas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <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="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <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="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9469,7 +9469,7 @@ <translation>Reabrir Com Codificação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> @@ -10417,12 +10417,12 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Selecionar se as guias de indentação devem estar visíveis.</translation> + <translation type="obsolete">Selecionar se as guias de indentação devem estar visíveis.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Mostrar Guias de Indentação</translation> + <translation type="obsolete">Mostrar Guias de Indentação</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="155"/> @@ -10435,12 +10435,12 @@ <translation>Usar tabulação para indentações</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether autoindentation shall be enabled</source> <translation>Selecionar quando a auto-indentação deve estar habilitada</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Indentação Automática</translation> </message> @@ -10455,62 +10455,62 @@ <translation>Convertir tabulações ao abrir</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Selecionar se indenta ao pressionar tabulação.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> <source>Tab key indents</source> <translation>Tabulação indenta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Comentários</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Selecionar para inserir o sinal de comentario na coluna 0</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> <translation><b>Inserir comentario na coluna 0</b><p>Selecionar para inserir o sinal de comentario na coluna 0. Caso contrário, o sinal de comentario é inserido na posição do primeiro caracter que não seja um espaço em branco.</p></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Inserir comentário na coluna 0</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Inserir comentário na coluna 0</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation>Espaço Virtual</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation>Espaço virtual é o espaço depois do último caracter de uma linha. Não está reservado a não ser que se introduza ou copie algum texto nele. A utilização do espaço virtual pode configurar-se com estas seleções.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> - <translation>Espaço virtual é o espaço depois do último caracter de uma linha. Não está reservado a não ser que se introduza ou copie algum texto nele. A utilização do espaço virtual pode configurar-se com estas seleções.</translation> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation>Selecionar para habilitar uma seleção retangular para extender o espaço virtual</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> + <translation>Seleção pode aceder ao espaço virtual</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> - <translation>Selecionar para habilitar uma seleção retangular para extender o espaço virtual</translation> + <source>Select to allow the cursor to be moved into virtual space</source> + <translation>Selecionar para permitir mover o cursor no espaço virtual</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation>Seleção pode aceder ao espaço virtual</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation>Selecionar para permitir mover o cursor no espaço virtual</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation>Cursor pode mover-se dentro do espaço virtual</translation> </message> @@ -12159,7 +12159,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Vários</translation> </message> @@ -12174,12 +12174,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation type="unfinished"></translation> </message> @@ -12429,100 +12429,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation>Erros:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation>Avisos:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation>Marcadores:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation>Pontos de Interrupção:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation>Tarefas:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation>Alterações:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation>Linha atual:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation>Fundo:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Selecionar se as guias de indentação devem estar visíveis.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Mostrar Guias de Indentação</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32742,7 +32777,7 @@ <translation>Ficheiro gravado</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Sem Título</translation> </message> @@ -32757,67 +32792,67 @@ <translation>Mini Editor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>A imprimir...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Impressão completa</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Erro durante a impressão</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Impressão cancelada</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Idiomas</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Sem Idioma</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Adivinhado</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Alternativas</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Analizador Léxico Pygments</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Selecionar o analizador léxico Pygments a aplicar.</translation> </message> @@ -35503,27 +35538,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation>Selecionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Selecionar o intérprete de Python{0} a usar:</translation> </message>
--- a/i18n/eric6_ru.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_ru.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8763,52 +8763,52 @@ <translation>Печать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Редактирование файла, открытого только на чтение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Печать...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Печать завершена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Ошибка печати</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Печать отменена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Файл изменён</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Файл изменён</translation> </message> @@ -8853,7 +8853,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -8883,82 +8883,82 @@ <translation>Левая клавиша мыши ставит точки останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> @@ -8968,12 +8968,12 @@ <translation type="obsolete">Автозавершение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Автозавершение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Автозавершение недоступно, так как не задан источник автозавершения.</translation> </message> @@ -9003,7 +9003,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -9013,12 +9013,12 @@ <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> @@ -9048,42 +9048,42 @@ <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -9123,82 +9123,82 @@ <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Добавить файлы...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Добавить файл под другим именем...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Добавить файлы...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Добавить файл под другим именем...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> @@ -9253,12 +9253,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -9338,7 +9338,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -9348,12 +9348,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -9363,12 +9363,12 @@ <translation>Удалить из словаря</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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> @@ -9393,47 +9393,47 @@ <translation>Очистить предупреждения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <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="5818"/> + <location filename="../QScintilla/Editor.py" line="5823"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5825"/> + <location filename="../QScintilla/Editor.py" line="5830"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6154"/> + <location filename="../QScintilla/Editor.py" line="6159"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Activating Auto-Completion Provider</source> <translation>Активация Автозавершения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4434"/> + <location filename="../QScintilla/Editor.py" line="4439"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Автозавершение не может быть подключено, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Activating Calltip Provider</source> <translation>Активация подсказок</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4624"/> + <location filename="../QScintilla/Editor.py" line="4629"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Подсказки не могут быть подключены, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> @@ -9458,27 +9458,27 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>Sort Lines</source> <translation>Сортировать строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7360"/> + <location filename="../QScintilla/Editor.py" line="7365"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5754"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>No warning messages available.</source> <translation>Нет предупреждающего сообщения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5815"/> + <location filename="../QScintilla/Editor.py" line="5820"/> <source>Style: {0}</source> <translation>Стиль: {0}</translation> </message> @@ -9503,7 +9503,7 @@ <translation>Открыть заново с кодировкой</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6148"/> + <location filename="../QScintilla/Editor.py" line="6153"/> <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> был изменён, будучи открытым в Eric. Обновить?</p></translation> </message> @@ -10450,22 +10450,22 @@ <translation>Заменять табуляцию при открытии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="185"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> <source>Select whether pressing the tab key indents.</source> <translation>Должна ли кнопка Tab увеличивать отступ.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="188"/> - <source>Tab key indents</source> - <translation>Кнопка Tab увеличивает отступ</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="165"/> - <source>Select whether autoindentation shall be enabled</source> - <translation>Разрешить/запретить автоматические отступы</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="168"/> + <source>Tab key indents</source> + <translation>Кнопка Tab увеличивает отступ</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> + <source>Select whether autoindentation shall be enabled</source> + <translation>Разрешить/запретить автоматические отступы</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Auto indentation</source> <translation>Автоматические отступы</translation> </message> @@ -10482,12 +10482,12 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="145"/> <source>Select whether indentation guides should be shown.</source> - <translation>Будут ли показываться линии отступа.</translation> + <translation type="obsolete">Будут ли показываться линии отступа.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="148"/> <source>Show Indentation Guides</source> - <translation>Показывать линии отступа</translation> + <translation type="obsolete">Показывать линии отступа</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="17"/> @@ -10500,52 +10500,52 @@ <translation>Табуляция && Отступы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="200"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="190"/> <source>Comments</source> <translation>Комментарии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="206"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="196"/> <source>Select to insert the comment sign at column 0</source> <translation>Вставить символ комментария в первую колонку</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="202"/> + <source>Insert comment at column 0</source> + <translation>Вставить комментарий в первую колонку</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="199"/> + <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> + <translation><b>Вставлять символ комментария в первую колонку</b><p>Вставлять символ комментария в первую колонку. Иначе символ комментариябудет вставляться в позицию первого отличного от пробела символа.</p></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="212"/> - <source>Insert comment at column 0</source> - <translation>Вставить комментарий в первую колонку</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="209"/> - <source><b>Insert comment at column 0</b><p>Select to insert the comment sign at column 0. Otherwise, the comment sign is inserted at the first non-whitespace position.</p></source> - <translation><b>Вставлять символ комментария в первую колонку</b><p>Вставлять символ комментария в первую колонку. Иначе символ комментариябудет вставляться в позицию первого отличного от пробела символа.</p></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="222"/> <source>Virtual Space</source> <translation>Виртуальное пространство</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="218"/> + <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> + <translation>Виртуальное пространство это пространство за концом строки которое не выделяется до тех пор пока оно не потребуется.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="228"/> - <source>Virtual space is the space after the last character of a line. It is not allocated unless some text is entered or copied into it. Usage of virtual space can be configured with these selections.</source> - <translation>Виртуальное пространство это пространство за концом строки которое не выделяется до тех пор пока оно не потребуется.</translation> + <source>Select to enable a rectangular selection to extend into virtual space</source> + <translation>Разрешить прямоугольному выделению заходить в виртуальное пространство</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="231"/> + <source>Selection may access virtual space</source> + <translation>Разрешить выделению заходить в виртуальное пространство</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="238"/> - <source>Select to enable a rectangular selection to extend into virtual space</source> - <translation>Разрешить прямоугольному выделению заходить в виртуальное пространство</translation> + <source>Select to allow the cursor to be moved into virtual space</source> + <translation>Разрешить курсору заходить в виртуальное пространство</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="241"/> - <source>Selection may access virtual space</source> - <translation>Разрешить выделению заходить в виртуальное пространство</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="248"/> - <source>Select to allow the cursor to be moved into virtual space</source> - <translation>Разрешить курсору заходить в виртуальное пространство</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.ui" line="251"/> <source>Cursor can move into virtual space</source> <translation>Курсор может заходить в виртуальное пространство</translation> </message> @@ -12110,7 +12110,7 @@ <translation>Переносить длинные строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1827"/> <source>Various</source> <translation>Разное</translation> </message> @@ -12125,12 +12125,12 @@ <translation>Показывать пробелы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1833"/> <source>Select to show a minimalistic context menu</source> <translation>Показать минималистичное контекстное меню</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1836"/> <source>Show minimal context menu</source> <translation>Показать минималистичное контекстное меню</translation> </message> @@ -12475,100 +12475,135 @@ <translation>Текущая строка всегда видима</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> <source>Marker Map</source> <translation>Таблица цвета маркеров</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> <source>Errors:</source> <translation>Ошибки:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1630"/> <source>Select the colour for error markers</source> <translation>Выберите цвет для пометки ошибок</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1640"/> <source>Warnings:</source> <translation>Предупреждения:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Select the colour for warning markers</source> <translation>Выберите цвет для пометки предупреждений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1663"/> <source>Bookmarks:</source> <translation>Закладки:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Select the colour for bookmark markers</source> <translation>Выберите цвет для пометки закладок</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1686"/> <source>Breakpoints:</source> <translation>Точки останова:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1699"/> <source>Select the colour for breakpoint markers</source> <translation>Выберите цвет для пометки точек останова</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1709"/> <source>Tasks:</source> <translation>Задачи:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1722"/> <source>Select the colour for task markers</source> <translation>Выберите цвет для пометки задач</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1732"/> <source>Changes:</source> <translation>Изменения:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1745"/> <source>Select the colour for change markers</source> <translation>Выберите цвет для пометки изменений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1755"/> <source>Coverage:</source> <translation>Покрытие:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1768"/> <source>Select the colour for coverage markers</source> <translation>Задайте цвет для отображения покрытия</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1778"/> <source>Current Line:</source> <translation>Текущая строка:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1791"/> <source>Select the colour for the current line marker</source> <translation>Выберите цвет для пометки текущей строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1801"/> <source>Background:</source> <translation>Фон:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1814"/> <source>Select the background colour for the marker map</source> <translation>Задайте цвет фона маркеров</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <source>Indentation Guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <source>Select whether indentation guides should be shown.</source> + <translation type="unfinished">Будут ли показываться линии отступа.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <source>Show Indentation Guides</source> + <translation type="unfinished">Показывать линии отступа</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <source>Indentation Guides foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <source>Select the foreground colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <source>Indentation Guides background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <source>Select the background colour for indentation guides</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -32694,7 +32729,7 @@ <translation>Файл загружен</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> + <location filename="../QScintilla/MiniEditor.py" line="2574"/> <source>Untitled</source> <translation>Без имени</translation> </message> @@ -32709,22 +32744,22 @@ <translation>Мини-редактор</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2611"/> + <location filename="../QScintilla/MiniEditor.py" line="2615"/> <source>Select all</source> <translation>Выбрать всё</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2612"/> + <location filename="../QScintilla/MiniEditor.py" line="2616"/> <source>Deselect all</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2626"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2629"/> + <location filename="../QScintilla/MiniEditor.py" line="2633"/> <source>No Language</source> <translation>Нет языка</translation> </message> @@ -32812,22 +32847,22 @@ <translation>Распечатать текущий файл</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2534"/> + <location filename="../QScintilla/MiniEditor.py" line="2538"/> <source>Printing...</source> <translation>Печать...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2551"/> + <location filename="../QScintilla/MiniEditor.py" line="2555"/> <source>Printing completed</source> <translation>Печать завершена</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2553"/> + <location filename="../QScintilla/MiniEditor.py" line="2557"/> <source>Error while printing</source> <translation>Ошибка печати</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2556"/> + <location filename="../QScintilla/MiniEditor.py" line="2560"/> <source>Printing aborted</source> <translation>Печать отменена</translation> </message> @@ -32852,27 +32887,27 @@ <translation><b>Предварительный просмотр печати</b><p>Предварительный просмотр печати текущего файла.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2652"/> + <location filename="../QScintilla/MiniEditor.py" line="2656"/> <source>Guessed</source> <translation>Догадки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2673"/> + <location filename="../QScintilla/MiniEditor.py" line="2677"/> <source>Alternatives</source> <translation>Альтернативы</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2674"/> <source>Alternatives ({0})</source> <translation>Альтернативы ({0})</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Pygments Lexer</source> <translation>Pygments лексер</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2687"/> + <location filename="../QScintilla/MiniEditor.py" line="2691"/> <source>Select the Pygments lexer to apply.</source> <translation>Задайте язык лексического анализатора.</translation> </message> @@ -35594,27 +35629,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1289"/> + <location filename="../Preferences/__init__.py" line="1291"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1317"/> + <location filename="../Preferences/__init__.py" line="1319"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1419"/> + <location filename="../Preferences/__init__.py" line="1421"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -62474,12 +62509,6 @@ <translation>&Подсказка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1335"/> - <source>Alt+Space</source> - <comment>Edit|Calltip</comment> - <translation></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1342"/> <source>Show Calltips</source> <translation>Показать подсказки</translation> @@ -63483,6 +63512,12 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1335"/> + <source>Meta+Alt+Space</source> + <comment>Edit|Calltip</comment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name>
--- a/i18n/eric6_tr.ts Sat Mar 14 14:29:22 2015 +0100 +++ b/i18n/eric6_tr.ts Sat Mar 14 14:36:52 2015 +0100 @@ -8599,7 +8599,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <source>Open File</source> <translation>Dosya Aç</translation> </message> @@ -8689,7 +8689,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6943"/> + <location filename="../QScintilla/Editor.py" line="6948"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> @@ -8929,7 +8929,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4882"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını etkinleştir</translation> </message> @@ -9044,347 +9044,347 @@ <translation>Kullanmak için Pygment lexer seç.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <source>Modification of Read Only file</source> <translation>Yalnızca okunabilir dosyada değişiklik</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1721"/> + <location filename="../QScintilla/Editor.py" line="1722"/> <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="2413"/> + <location filename="../QScintilla/Editor.py" line="2414"/> <source>Printing...</source> <translation>Yazılıyor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2430"/> + <location filename="../QScintilla/Editor.py" line="2431"/> <source>Printing completed</source> <translation>Yazdırma tamalandı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2432"/> + <location filename="../QScintilla/Editor.py" line="2433"/> <source>Error while printing</source> <translation>Yazdırılırken hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2435"/> + <location filename="../QScintilla/Editor.py" line="2436"/> <source>Printing aborted</source> <translation>Yazdırma iptal edildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <source>File Modified</source> <translation>Dosya Değiştirildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2793"/> + <location filename="../QScintilla/Editor.py" line="2794"/> <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="2848"/> + <location filename="../QScintilla/Editor.py" line="2849"/> <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="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2951"/> + <location filename="../QScintilla/Editor.py" line="2952"/> <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="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4333"/> + <location filename="../QScintilla/Editor.py" line="4338"/> <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="4880"/> + <location filename="../QScintilla/Editor.py" line="4885"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5225"/> + <location filename="../QScintilla/Editor.py" line="5230"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5282"/> + <location filename="../QScintilla/Editor.py" line="5287"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5289"/> + <location filename="../QScintilla/Editor.py" line="5294"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5404"/> + <location filename="../QScintilla/Editor.py" line="5409"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5564"/> + <location filename="../QScintilla/Editor.py" line="5569"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5879"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5907"/> + <location filename="../QScintilla/Editor.py" line="5912"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5921"/> + <location filename="../QScintilla/Editor.py" line="5926"/> <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="5930"/> + <location filename="../QScintilla/Editor.py" line="5935"/> <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="5950"/> + <location filename="../QScintilla/Editor.py" line="5955"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5967"/> + <location filename="../QScintilla/Editor.py" line="5972"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5983"/> + <location filename="../QScintilla/Editor.py" line="5988"/> <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="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6001"/> <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="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6460"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <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="6481"/> + <location filename="../QScintilla/Editor.py" line="6486"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6483"/> + <location filename="../QScintilla/Editor.py" line="6488"/> <source>Add file...</source> <translation>Dosya ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> - <source>Add files...</source> - <translation>Dosyaları ekle...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6487"/> - <source>Add aliased file...</source> - <translation>Kısaltmalar dosyasına ekle...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6490"/> + <source>Add files...</source> + <translation>Dosyaları ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6492"/> + <source>Add aliased file...</source> + <translation>Kısaltmalar dosyasına ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6495"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6494"/> + <location filename="../QScintilla/Editor.py" line="6499"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6513"/> + <location filename="../QScintilla/Editor.py" line="6518"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6534"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6557"/> + <location filename="../QScintilla/Editor.py" line="6562"/> <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="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6621"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6641"/> + <location filename="../QScintilla/Editor.py" line="6646"/> <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="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6655"/> + <location filename="../QScintilla/Editor.py" line="6660"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6946"/> + <location filename="../QScintilla/Editor.py" line="6951"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6948"/> + <location filename="../QScintilla/Editor.py" line="6953"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3018"/> + <location filename="../QScintilla/Editor.py" line="3019"/> <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>