Sat, 06 Dec 2014 13:11:15 +0100
Added some explanatory note to the editor highlighter styles configuration page.
Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui | file | annotate | diff | comparison | revisions | |
i18n/eric6_cs.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_de.qm | file | annotate | diff | comparison | revisions | |
i18n/eric6_de.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_en.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_es.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_fr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_it.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_pt.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_ru.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_tr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric6_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sat Dec 06 13:03:59 2014 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sat Dec 06 13:11:15 2014 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>EditorHighlightingStylesPage</class> - <widget class="QWidget" name="EditorHighlightingStylesPage" > - <property name="geometry" > + <widget class="QWidget" name="EditorHighlightingStylesPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,51 +10,51 @@ <height>592</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure syntax highlighting</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure syntax highlighting</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line1" > - <property name="frameShape" > + <widget class="Line" name="line1"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="TextLabel1_3" > - <property name="toolTip" > + <widget class="QLabel" name="TextLabel1_3"> + <property name="toolTip"> <string/> </property> - <property name="text" > + <property name="text"> <string>Lexer Language:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring></cstring> </property> </widget> </item> <item> - <widget class="QComboBox" name="lexerLanguageComboBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <widget class="QComboBox" name="lexerLanguageComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select the lexer language to be configured.</string> </property> </widget> @@ -61,81 +62,81 @@ </layout> </item> <item> - <widget class="QGroupBox" name="styleGroup" > - <property name="title" > + <widget class="QGroupBox" name="styleGroup"> + <property name="title"> <string>Style Element</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item rowspan="12" row="0" column="0" > - <widget class="QListWidget" name="styleElementList" > - <property name="selectionMode" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" rowspan="12"> + <widget class="QListWidget" name="styleElementList"> + <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QPushButton" name="foregroundButton" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QPushButton" name="foregroundButton"> + <property name="toolTip"> <string>Select the foreground colour.</string> </property> - <property name="text" > + <property name="text"> <string>Foreground Colour</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QPushButton" name="backgroundButton" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QPushButton" name="backgroundButton"> + <property name="toolTip"> <string>Select the background colour.</string> </property> - <property name="text" > + <property name="text"> <string>Background Colour</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QPushButton" name="fontButton" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QPushButton" name="fontButton"> + <property name="toolTip"> <string>Select the font.</string> </property> - <property name="text" > + <property name="text"> <string>Font</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QCheckBox" name="eolfillCheckBox" > - <property name="toolTip" > + <item row="3" column="1"> + <widget class="QCheckBox" name="eolfillCheckBox"> + <property name="toolTip"> <string>Select end of line fill.</string> </property> - <property name="text" > + <property name="text"> <string>Fill to end of line</string> </property> </widget> </item> - <item row="4" column="1" > - <widget class="Line" name="line" > - <property name="orientation" > + <item row="4" column="1"> + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="5" column="1" > - <widget class="QPushButton" name="defaultButton" > - <property name="toolTip" > + <item row="5" column="1"> + <widget class="QPushButton" name="defaultButton"> + <property name="toolTip"> <string>Press to set the current style to its default values</string> </property> - <property name="text" > + <property name="text"> <string>to Default</string> </property> </widget> </item> - <item row="6" column="1" > + <item row="6" column="1"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>51</height> @@ -143,65 +144,75 @@ </property> </spacer> </item> - <item row="7" column="1" > - <widget class="QPushButton" name="allBackgroundColoursButton" > - <property name="toolTip" > + <item row="7" column="1"> + <widget class="QPushButton" name="allBackgroundColoursButton"> + <property name="toolTip"> <string>Select the background colour for all styles</string> </property> - <property name="text" > + <property name="text"> <string>All Background Colours</string> </property> </widget> </item> - <item row="8" column="1" > - <widget class="QPushButton" name="allFontsButton" > - <property name="toolTip" > + <item row="8" column="1"> + <widget class="QPushButton" name="allFontsButton"> + <property name="toolTip"> <string>Select the font for all styles.</string> </property> - <property name="text" > + <property name="text"> <string>All Fonts</string> </property> </widget> </item> - <item row="9" column="1" > - <widget class="QPushButton" name="allEolFillButton" > - <property name="toolTip" > + <item row="9" column="1"> + <widget class="QPushButton" name="allEolFillButton"> + <property name="toolTip"> <string>Select the eol fill for all styles</string> </property> - <property name="text" > + <property name="text"> <string>All Fill to end of line</string> </property> </widget> </item> - <item row="10" column="1" > - <widget class="Line" name="line_2" > - <property name="orientation" > + <item row="10" column="1"> + <widget class="Line" name="line_2"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="11" column="1" > - <widget class="QPushButton" name="allDefaultButton" > - <property name="toolTip" > + <item row="11" column="1"> + <widget class="QPushButton" name="allDefaultButton"> + <property name="toolTip"> <string>Press to set all styles to their default values</string> </property> - <property name="text" > + <property name="text"> <string>All to Default</string> </property> </widget> </item> - <item row="12" column="0" colspan="2" > - <widget class="QLineEdit" name="sampleText" > - <property name="focusPolicy" > + <item row="12" column="0" colspan="2"> + <widget class="QLineEdit" name="sampleText"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Sample Text</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignHCenter</set> </property> - <property name="readOnly" > + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="13" column="0" colspan="2"> + <widget class="QLabel" name="label"> + <property name="text"> + <string><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</string> + </property> + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -210,49 +221,49 @@ </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="importCurrentButton" > - <property name="enabled" > + <widget class="QPushButton" name="importCurrentButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Imports all styles of the currently selected language</string> </property> - <property name="text" > + <property name="text"> <string>Import styles</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="exportCurrentButton" > - <property name="enabled" > + <widget class="QPushButton" name="exportCurrentButton"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Exports all styles of the currently selected language</string> </property> - <property name="text" > + <property name="text"> <string>Export styles</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="importAllButton" > - <property name="toolTip" > + <widget class="QPushButton" name="importAllButton"> + <property name="toolTip"> <string>Imports all styles of all languages</string> </property> - <property name="text" > + <property name="text"> <string>Import all styles</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="exportAllButton" > - <property name="toolTip" > + <widget class="QPushButton" name="exportAllButton"> + <property name="toolTip"> <string>Exports all styles of all languages</string> </property> - <property name="text" > + <property name="text"> <string>Export all styles</string> </property> </widget>
--- a/i18n/eric6_cs.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_cs.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5961,37 +5961,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Spustit debuger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Rodičovský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Dětský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Větvení klienta</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Pokračovat ve fork větvi.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Python2 interpreter není nakonfigurován.</p></translation> </message> @@ -5999,37 +5999,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Spustit debuger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Rodičovský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Dětský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Větvení klienta</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Pokračovat ve fork větvi.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"><p>Python2 interpreter není nakonfigurován.</p> {3 ?}</translation> </message> @@ -6037,17 +6037,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Spustit debuger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10434,72 +10434,72 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Konfigurace zvýraznění syntaxe</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Jazyk lexeru:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Výběr jazyka, který se bude konfigurovat.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Element stylu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Výběr fontu pro všechny styly.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Všechny fonty</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Výběr barvy pozadí pro všechny styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Všechny barvy pozadí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Ukázka textu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Výběr barvy pozadí.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Barva pozadí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Vybrat font.</translation> </message> @@ -10509,117 +10509,117 @@ <translation></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Vybrat barvu popředí.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Barva popředí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Vybrat pro eol vyplní všechny styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Vše Vyplnit do konce řádku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Zapnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Vypnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Vybrat pro doplnit do konce řádku pro všechny styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>na výchozí hodnotu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Stisknout pro nastavení všech stylů na výchozí hodnoty</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Vše na výchozí hodnoty</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Importovat všechny styly právě vybraného jazyka</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Import stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Exportovat všechny styly právě vybraného jazyka</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Export stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Importovat všechny styly všech jazyků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Import všech stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Exportovat všechny styly všech jazyků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Export všech stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Export stylů zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Importovat styly zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Soubor se styly zvýrazňování (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se do souboru <b>{0}</b> nepodařilo exportovat.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se ze souboru <b>{0}</b> nepodařilo načít.</p><p>Důvod: {1}</p></translation> </message> @@ -10639,10 +10639,15 @@ <translation>Jen velikost</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21326,17 +21331,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -21461,42 +21466,42 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -21536,7 +21541,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> @@ -21551,7 +21556,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -21571,28 +21576,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -21612,42 +21617,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35173,27 +35178,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62593,12 +62598,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">Generování hlavního okna...</translation> </message>
--- a/i18n/eric6_de.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_de.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5980,37 +5980,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Vaterprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Kindprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Forkpfad.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Kein Python 2-Interpreter gefunden.</p></translation> </message> @@ -6018,37 +6018,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Vaterprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Kindprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Forkpfad.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation><p>Kein Python 3-Interpreter gefunden.</p></translation> </message> @@ -6056,17 +6056,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation><p>Kein Ruby-Interpreter gefunden.</p></translation> </message> @@ -10466,67 +10466,67 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Programmiersprache:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Wähle die zu konfigurierende Programmiersprache aus.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Syntaxelement</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Wähle den Modus „Füllen bis zum Zeilenende“.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Füllen bis zum Zeilenende</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Wähle die Schriftart für alle Stile.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Alle Schriftarten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Wähle die Hintergrundfarbe für alle Stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Alle Hintergrundfarben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Beispieltext</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Wähle die Hintergrundfarbe aus.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Hintergrundfarbe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Wähle die Schriftart aus.</translation> </message> @@ -10536,122 +10536,122 @@ <translation>Schriftart</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Wähle die Textfarbe aus.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Textfarbe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Syntaxhervorhebung einstellen</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Wähle Füllen bis Zeilenende für alle Stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Alle Füllen bis Ende</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Eingeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Ausgeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Wähle Füllen bis Zeilenende für alle Stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>auf Default</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Drücken, um den alle Stile auf Defaultwerte zurückzusetzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Alle auf Default</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Importiert alle Stile der aktuell ausgewählten Sprache</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Stile importieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Exportiert alle Stile der aktuell ausgewählten Sprache</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Stile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Importiert alle Stile aller Sprachen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Alle Stile importieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Exportiert alle Stile aller Sprachen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Alle Stile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Hervorhebungsstile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Die Hervorhebungsstile konnten nicht in die Datei <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Hervorhebungsstile importieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Die Hervorhebungsstile konnten nicht von der Datei <b>{0}</b> gelesen werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Dateien für Hervorhebungsstile (*.e4h)</translation> </message> @@ -10671,10 +10671,15 @@ <translation>nur Größe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation>Drücken, um den aktuellen Stil auf Defaultwerte zurückzusetzen</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation><b>Hinweis:</b> Der Haken in der obigen Liste zeigt die 'Füllen bis zum Zeilenende' Eigenschaft des Eintrages an.</translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21396,17 +21401,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -21521,42 +21526,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -21606,7 +21611,7 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation>Alle</translation> </message> @@ -21621,7 +21626,7 @@ <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> @@ -21641,28 +21646,28 @@ <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -21682,42 +21687,42 @@ <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation>Marke setzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation>Marke setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation>Binärriesen herunterladen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation>Binärriesen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -35259,27 +35264,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation>Wähle den Python{0}-Interpreter</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation> </message> @@ -62829,12 +62834,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation>Starte...</translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message>
--- a/i18n/eric6_en.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_en.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5921,37 +5921,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> @@ -5959,37 +5959,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -5997,17 +5997,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10379,47 +10379,47 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation type="unfinished"></translation> </message> @@ -10429,102 +10429,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation type="unfinished"></translation> </message> @@ -10544,50 +10544,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21276,17 +21281,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -21436,47 +21441,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -21491,7 +21496,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> @@ -21511,28 +21516,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21552,42 +21557,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35091,27 +35096,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62273,12 +62278,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_es.ts Sat Dec 06 13:11:15 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" 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"/> @@ -5978,37 +5977,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Comenzar Depuración</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>No ha sido posible lanzar el extremo del depurador.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Proceso Padre</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Proceso hijo</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Fork del cliente</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Seleccionar la rama de fork para continuar.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>No se ha encontrado un intérprete de Python2 configurado.</p></translation> </message> @@ -6016,37 +6015,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Iniciar Depurador</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>No ha sido posible lanzar el extremo del depurador.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Proceso Padre</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Proceso hijo</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Fork del cliente</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Seleccionar la rama de fork para continuar.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation><p>No se ha encontrado un intérprete de Python configurado.</p></translation> </message> @@ -6054,17 +6053,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Comenzar Depurador</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>No ha sido posible lanzar el extremo del depurador.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation><p>No se ha encontrado un intérprete de Ruby configurado.</p></translation> </message> @@ -10464,72 +10463,72 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Configurar resaltado sintactico</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Lenguaje de Analizador Léxico:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Seleccione el lenguaje de analizador léxico a configurar.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Estilo del elemento</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Selecciona llenar hasta el fin de la línea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Llenar hasta el final de la línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Selecciona la fuente para todos los estilos.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Todas las Fuentes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Selecciona el color de fondo para todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Todos los colores de fondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Texto de Ejemplo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Selecciona el Color de Fondo.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Color de Fondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Selección de Fuente.</translation> </message> @@ -10539,117 +10538,117 @@ <translation>Fuente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Selección del Color de Fuente.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Color de Fuente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Selecciona llenado hasta final de línea para todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Todo llena hasta el final de la línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Deshabilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Selecciona llenar hasta el final de línea para todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>a Por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Pulse para establecer todos los estilos a sus valores por defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Todos a Por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Importar todos los estilos del lenguaje actualmente seleccionado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Importar estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Exportar todos los estilos del lenguaje actualmente seleccionado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Exportar estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Importa todos los estilos de todos los lenguajes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Importar todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Exporta todos los estilos de todos los lenguajes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Exportar todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Exportar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Importar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Archivos de estilos de resaltado (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Los estilos de resaltado no se han podido exportar al archivo <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Los estilos de resaltado no se han podido leer del archivo <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -10669,10 +10668,15 @@ <translation>Tamaño solamente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation>Pulsar para establecer el estilo actual a valores por defecto</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -15534,7 +15538,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> @@ -21397,17 +21401,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -21522,27 +21526,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -21557,17 +21561,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -21607,7 +21611,7 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation>Todo</translation> </message> @@ -21622,7 +21626,7 @@ <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> @@ -21642,29 +21646,29 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -21684,42 +21688,42 @@ <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation>Aplicar Tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation>Aplicar Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation>Hacer pull de archivos grandes</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation>Hacer pull de archivos grandes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -35261,27 +35265,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1174"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1202"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1202"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1304"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation>Seleccionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1304"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation> </message> @@ -62778,12 +62782,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation>Comenzando...</translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation>Generando Ventana Principal...</translation> </message>
--- a/i18n/eric6_fr.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_fr.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5960,37 +5960,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Démarrage du débogueur</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Impossible de lancer le débogueur en arrière-plan.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -5998,37 +5998,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation type="unfinished">Démarrage du débogueur</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"><p>Impossible de lancer le débogueur en arrière-plan.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -6036,17 +6036,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Démarrage du débogueur</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Impossible de lancer le débogueur en arrière-plan.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10440,67 +10440,67 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Analyseur syntaxique:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Sélectionne un langage pour la l'analyse syntaxique.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Type de Texte</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Cocher pour appliquer le style jusqu'en fin de ligne.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Appliquer jusqu'à la fin de ligne</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Sélectionne une police pour tous les styles.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Toutes les polices</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Sélectionne une couleur de fond pour tous les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Toutes les couleurs de fond</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Texte brut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Sélectionne la couleur de fond.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Couleur de fond</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Sélectionner la police.</translation> </message> @@ -10510,122 +10510,122 @@ <translation>Police</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Sélectionne la couleur des caractères.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Couleur des caractères</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Configuration de l'analyse syntaxique</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Sélectionner pour appliquer les styles jusqu'en fin de ligne pour toutes les entrées</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Tout appliquer jusqu'aux fins de lignes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Activé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Désactivé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Sélectionner pour appliquer tous les styles jusqu'en fin de lignes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Cliquer pour appliquer les styles par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Tous par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Importe tous les styles du langage sélectionné</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Importer les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Exporte tous les styles du langage sélectionné</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Exporter les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Importe tous les styles de tous les langages</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Importer tous les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Exporte tous les styles de tous les langages</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Exporter tous les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Exportation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Importation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -10645,10 +10645,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21348,17 +21353,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -21483,42 +21488,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -21558,7 +21563,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> @@ -21573,7 +21578,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> @@ -21593,28 +21598,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21634,42 +21639,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35190,27 +35195,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62659,12 +62664,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">Création de la fenêtre principale...</translation> </message>
--- a/i18n/eric6_it.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_it.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5973,37 +5973,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Avvia Debugger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Il debugger non può essere avviato.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Processo padre</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Processo figlio</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Lancio processo figlio in corso</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Seleziona il client da seguire.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Nessun interprete Python2 configurato.</p></translation> </message> @@ -6011,37 +6011,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Avvia Debugger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Il debugger non può essere avviato.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Processo padre</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Processo figlio</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Lancio processo figlio in corso</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Seleziona il client da seguire.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"><p>Nessun interprete Python2 configurato.</p> {3 ?}</translation> </message> @@ -6049,17 +6049,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Avvia il Debugger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Il debugger non può essere avviato.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10457,67 +10457,67 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Linguaggio dell'analizzatore sintattico:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Selezione il linguaggio dell'analizzatore da configurare.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Elementi di stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Seleziona il riempimento di fine linea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Riempi fino a fine linea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Seleziona font per tutti gli stili.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Tutti i font</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Seleziona il colore dello sfondo per tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Tutti i colori di sfondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Testo di esempio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Seleziona il colore di sfondo.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Colore di sfondo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Seleziona il font.</translation> </message> @@ -10527,122 +10527,122 @@ <translation>Font</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Seleziona il colore di primo piano.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Colore di primo piano</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Configura l'evidenziazione della sintassi</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Selezione il riempimento di fine linea per tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Riempi tutto fino a fine linea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Abilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Disabilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Seleziona il riempimento fino a fine linea per tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>al default</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Premi per impostare tutti gli stili ai loro valori di default</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Tutto al default</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Importa tutti gli stili del linguaggio attualmente selezionato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Importa stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Esporta tutti gli stili del linguaggio correntemente selezionato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Esporta stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Importa tutti gli stili di tutti i linguaggi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Importa tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Esporta tutti gli stili di tutti i linguaggi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Esporta tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Esporta stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Importa gli stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Highlighting styles file (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Lo stile di evidenziazione non può essere esportato nel file <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Gli stili di evidenziazione non possono essere letti dal file <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -10662,10 +10662,15 @@ <translation>Solo dimensione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation>Premere il tasto per settare lo stile corrente al suo valore predefinito</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21376,17 +21381,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Autore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -21511,42 +21516,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Cancellato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -21586,7 +21591,7 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation>Tutti</translation> </message> @@ -21601,7 +21606,7 @@ <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> @@ -21621,28 +21626,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -21662,42 +21667,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35231,27 +35236,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62696,12 +62701,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished">Inizio...</translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">Generazione Main Window...</translation> </message>
--- a/i18n/eric6_pt.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_pt.ts Sat Dec 06 13:11:15 2014 +0100 @@ -6241,37 +6241,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Iniciar o Depurador</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Interpretador de Python2 não configurado.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>A instalação de retaguarda do depurador não pode iniciar.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Processo Pai</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Processo Filho</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Bifurcação do Cliente</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Selecionar o ramo da bifurcação a seguir.</translation> </message> @@ -6279,37 +6279,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Iniciar o Depurador</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>A instalação de retaguarda do depurador não pode iniciar.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Processo Pai</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Processo Filho</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Bifurcação do Cliente</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Selecionar o ramo da bifurcação a seguir.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"><p>Interpretador de Python2 não configurado.</p> {3 ?}</translation> </message> @@ -6317,17 +6317,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Iniciar o Depurador</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>A instalação de retaguarda do depurador não pode iniciar.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation><p>Não há Intérprete de Ruby configurado.</p></translation> </message> @@ -10799,47 +10799,47 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation type="unfinished"></translation> </message> @@ -10849,102 +10849,102 @@ <translation>Tipo de Letra</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation type="unfinished"></translation> </message> @@ -10964,50 +10964,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21788,17 +21793,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation type="unfinished">Mensagem</translation> </message> @@ -21948,47 +21953,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation type="unfinished">Apagado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">O processo {0} não se pôde iniciar. Assegure-se que está no caminho de busca.</translation> </message> @@ -22003,7 +22008,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> @@ -22023,28 +22028,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22069,42 +22074,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35642,17 +35647,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> @@ -35667,12 +35672,12 @@ <translation type="obsolete">Selecionar o intérprete de Python2 a usar:</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62980,12 +62985,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished">Começando...</translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">Gerando a Janela Principal...</translation> </message>
--- a/i18n/eric6_ru.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_ru.ts Sat Dec 06 13:11:15 2014 +0100 @@ -6001,37 +6001,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Интерпретатор Python2 не настроен.</p></translation> </message> @@ -6039,37 +6039,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation><p>Интерпретатор Python3 не настроен.</p></translation> </message> @@ -6077,17 +6077,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить backend отладчика</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation><p>Интерпретатор Ruby не настроен.</p></translation> </message> @@ -10492,67 +10492,67 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Язык лексического анализатора:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Выберите язык лексического анализатора для настройки.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Элемент стиля</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Задайте тип заливки фона в конце строки.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>До конца строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Выбрать шрифт для всех стилей.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Все шрифты</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Задайте цвет фона для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Все цвета фона</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Это пример</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Задайте цвет фона.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Цвет фона</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Выберите шрифт.</translation> </message> @@ -10562,122 +10562,122 @@ <translation>Шрифт</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Задайте цвет шрифта.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Цвет шрифта</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Настроить подстветку синтаксиса</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Заливка до конца строки для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Заливка до конца строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Разрешена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Отключено</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Заливка до конца строки для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Установить значения по умолчанию для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Всё по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Импортировать все стили для текущего языка</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Импортировать стили</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Экспортировать все стили для текущего языка</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Экспортировать стили</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Импортировать все стили для всех языков</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Импортировать все стили</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Экспортировать все стили для всех языков</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Экспортировать все стили</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Экспорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Ошибка экспорта стилей подсветки в файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Импорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Ошибка импорта стилей подсветки из файла<b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Файлы стилей подсветки (*.e4h)</translation> </message> @@ -10697,10 +10697,15 @@ <translation>Только размер</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation>Установить стиль по умолчанию</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21452,17 +21457,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -21578,27 +21583,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -21613,17 +21618,17 @@ <translation>Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -21663,7 +21668,7 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation>Все</translation> </message> @@ -21678,7 +21683,7 @@ <translation>лог (исходящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> @@ -21698,29 +21703,29 @@ <translation>Фаза</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation>Изменить фазу выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Изменить фазу</b> <p>Изменить фазу выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation>Копировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -21740,42 +21745,42 @@ <translation>Выберите действие из меню</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation>Скопировать выбранные изменения в текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation>Метка</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation>Метка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation>Помеченная ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation>Загружать большие файлы</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation>Загружать большие файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation>Загружать большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -35351,27 +35356,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -62990,12 +62995,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message>
--- a/i18n/eric6_tr.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_tr.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5955,37 +5955,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>Hata Ayıklayıcıyı Başlat</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Python2 yorumlayıcısı ayarlanmamış.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Hata ayıklayıcıbaşlatılamadı.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation>Ana İşlem</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation>Alt işlem</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation>İstemci çatallaşması</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation>Takip eden çatallaşmadaki branşı seç.</translation> </message> @@ -5993,37 +5993,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation>Hata Ayıklayıcıyı Başlat</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Hata ayıklayıcıbaşlatılamadı.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation>Ana İşlem</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation>Alt işlem</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation>İstemci çatallaşması</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation>Takip eden çatallaşmadaki branşı seç.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"><p>Python2 yorumlayıcısı ayarlanmamış.</p> {3 ?}</translation> </message> @@ -6031,17 +6031,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>Hata Ayıklayıcıyı Başlat</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Hata ayıklayıcıbaşlatılamadı.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10425,47 +10425,47 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>Sözdizimi vurgularını ayarlar</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>Lexer Dili:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>Lexer dilini ayarlamak için seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>Stil Öğesi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>Önalan rengini seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>Önalana Rengi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>Arkaalan rengini seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>Arkaalan Rengi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>Yazı tipini seç.</translation> </message> @@ -10475,102 +10475,102 @@ <translation>Yazı Tipi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>Satır sonuna kadar dolrurmak için seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>Satırın sonuna kadar doldur</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>Varzsayılan</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>Tüm stiller için arkaalan rengini seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>Tüm Arkaalan Renkleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>Tüm stiller için yazı tipini seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>Tüm Yazıtipleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>Tüm stiller için satır sonunu seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>Satırın sonuna kadar hepsini doldur</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>Tüm stilleri kendi varsayılanına ayarlamak için basınız</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>Hepisini varsayılana al</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>Örnek Metin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>Halihazırda seçilen dillerin tüm sitillerini içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>Stilleri içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>Seçilen geçerli dilin tüm stillerini dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>Stilleri dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>Seçilen geçerli dilin tüm stillerini içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>Tüm stilleri içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>Stillerin tamamını tüm diller için dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>Tüm stilleri dışa aktar</translation> </message> @@ -10590,50 +10590,55 @@ <translation>Yalnızca boyut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>Etkinleştirilmiş</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>Onaylanmamış</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>Tüm stiller için satır sonunu doldurmayı seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>Vurgulama stillerini dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation>Metin vurgulayıcı stil dosyaları (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Metin vurgulayacı stili <b>{0}</b> dosyasına dış aktarılamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>Vurgulama stillerini içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Metin vurgulayacı stili <b>{0}</b> dosyasından okunamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21320,17 +21325,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -21480,42 +21485,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -21540,12 +21545,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> @@ -21565,28 +21570,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -21606,42 +21611,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished">Etiket</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished">Etiket</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35153,27 +35158,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62402,12 +62407,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">Anapencere üretiliyor...</translation> </message>
--- a/i18n/eric6_zh_CN.GB2312.ts Sat Dec 06 13:03:59 2014 +0100 +++ b/i18n/eric6_zh_CN.GB2312.ts Sat Dec 06 13:11:15 2014 +0100 @@ -5948,37 +5948,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source>Start Debugger</source> <translation>启动调试器</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="372"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="376"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>调试器后端无法启动。</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="813"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="817"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="814"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="818"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="819"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="163"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="167"/> <source><p>No Python2 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -5986,37 +5986,37 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source>Start Debugger</source> <translation type="unfinished">启动调试器</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="369"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="373"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"><p>调试器后端无法启动。</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="810"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="814"/> <source>Parent Process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> <source>Child process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Client forking</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> <source>Select the fork branch to follow.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="160"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="164"/> <source><p>No Python3 interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -6024,17 +6024,17 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source>Start Debugger</source> <translation>启动调试器</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="342"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="346"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>调试器后端无法启动。</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="153"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="157"/> <source><p>No Ruby interpreter configured.</p></source> <translation type="unfinished"></translation> </message> @@ -10406,47 +10406,47 @@ <context> <name>EditorHighlightingStylesPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="17"/> <source><b>Configure syntax highlighting</b></source> <translation><b>配置语法高亮</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="41"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="42"/> <source>Lexer Language:</source> <translation>词法分析器语言:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="58"/> <source>Select the lexer language to be configured.</source> <translation>选择要配置的词法分析器语言。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="67"/> <source>Style Element</source> <translation>风格元素</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> <source>Select the foreground colour.</source> <translation>选择前景色。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="82"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> <source>Foreground Colour</source> <translation>前景色</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> <source>Select the background colour.</source> <translation>选择背景色。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> <source>Background Colour</source> <translation>背景色</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> <source>Select the font.</source> <translation>选择字体。</translation> </message> @@ -10456,142 +10456,142 @@ <translation>字体</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> <source>Select end of line fill.</source> <translation>选择行尾填充。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Fill to end of line</source> <translation>填充到行尾</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="130"/> <source>to Default</source> <translation>默认</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> <source>Select the background colour for all styles</source> <translation>为所有风格选择背景色</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="152"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> <source>All Background Colours</source> <translation>所有背景色</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="160"/> <source>Select the font for all styles.</source> <translation>为所有风格选择字体</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="162"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="163"/> <source>All Fonts</source> <translation>所有字体</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="169"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> <source>Select the eol fill for all styles</source> <translation>为所有风格选择行尾填充</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="173"/> <source>All Fill to end of line</source> <translation>所有行尾填充</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="186"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> <source>Press to set all styles to their default values</source> <translation>点击将所有风格恢复成其默认值</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="190"/> <source>All to Default</source> <translation>全部默认</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="200"/> <source>Sample Text</source> <translation>示例文本 Sample Text</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="231"/> <source>Imports all styles of the currently selected language</source> <translation>导入当前选择语言的所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="234"/> <source>Import styles</source> <translation>导入风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="244"/> <source>Exports all styles of the currently selected language</source> <translation>导出当前选择语言的所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="247"/> <source>Export styles</source> <translation>导出风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="243"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="254"/> <source>Imports all styles of all languages</source> <translation>导入所有语言的所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="246"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="257"/> <source>Import all styles</source> <translation>导入所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="264"/> <source>Exports all styles of all languages</source> <translation>导出所有语言的所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="256"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="267"/> <source>Export all styles</source> <translation>导出所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="329"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="336"/> <source>Enabled</source> <translation>已开启</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="330"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="337"/> <source>Disabled</source> <translation>已禁用</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="331"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="338"/> <source>Select fill to end of line for all styles</source> <translation>为所有风格选择行尾填充</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source>Export Highlighting Styles</source> <translation>导出高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source>Import Highlighting Styles</source> <translation>导入高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="455"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="462"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="446"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="471"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="478"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -10611,10 +10611,15 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="213"/> + <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -21306,17 +21311,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1412"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1409"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -21441,42 +21446,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="832"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="598"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="601"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="604"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -21516,7 +21521,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>All</source> <translation type="unfinished">全部</translation> </message> @@ -21531,7 +21536,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> @@ -21551,28 +21556,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1579"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21592,42 +21597,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> - <source>Tag</source> - <translation type="unfinished">标签</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="177"/> + <source>Tag</source> + <translation type="unfinished">标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1616"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="183"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="922"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35123,27 +35128,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1170"/> + <location filename="../Preferences/__init__.py" line="1180"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1198"/> + <location filename="../Preferences/__init__.py" line="1208"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1300"/> + <location filename="../Preferences/__init__.py" line="1310"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -62580,12 +62585,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="297"/> + <location filename="../eric6.py" line="298"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../eric6.py" line="302"/> + <location filename="../eric6.py" line="303"/> <source>Generating Main Window...</source> <translation type="unfinished">正在产生主窗口……</translation> </message>