--- a/i18n/eric6_fr.ts Sat Jul 26 12:05:01 2014 +0200
+++ b/i18n/eric6_fr.ts Sat Jul 26 12:08:31 2014 +0200
@@ -5509,12 +5509,12 @@
<translation>modifiée</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="679"/>
+ <location filename="../Debugger/DebugServer.py" line="681"/>
<source>Connection from illegal host</source>
<translation>Connexion en provenance d'un hote illégal</translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1281"/>
+ <location filename="../Debugger/DebugServer.py" line="1283"/>
<source>
Not connected
</source>
@@ -5526,18 +5526,18 @@
<translation type="obsolete"><p>Connexion demandée par l'hôte <b>%1</b>. Acceptez-vous la connexion ?</p></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="679"/>
+ <location filename="../Debugger/DebugServer.py" line="681"/>
<source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1461"/>
+ <location filename="../Debugger/DebugServer.py" line="1463"/>
<source>Passive debug connection received
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugServer.py" line="1475"/>
+ <location filename="../Debugger/DebugServer.py" line="1477"/>
<source>Passive debug connection closed
</source>
<translation type="unfinished"></translation>
@@ -6371,12 +6371,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="519"/>
+ <location filename="../Debugger/DebugViewer.py" line="520"/>
<source>waiting at breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="521"/>
+ <location filename="../Debugger/DebugViewer.py" line="522"/>
<source>running</source>
<translation type="unfinished"></translation>
</message>
@@ -12172,12 +12172,12 @@
<translation>Configuration de l'analyse Bash</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="975"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="989"/>
<source>Select whether folding of comments shall be possible</source>
<translation>Indique si les commentaires sur plusieurs lignes doivent être contractés</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/>
<source>Fold comments</source>
<translation>Contraction des commentaires</translation>
</message>
@@ -12207,12 +12207,12 @@
<translation>Indentation parenthèse ouvrante</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="946"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="960"/>
<source>Select whether folding at else statement should be possible</source>
<translation>Indique si les instructions "else" doivent être contractées</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="949"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="963"/>
<source>Fold at else</source>
<translation>Contraction des "else"</translation>
</message>
@@ -12292,22 +12292,22 @@
<translation>Configuration pour Python</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="766"/>
<source>Select whether bad indentation shall be highlighted</source>
<translation>Sélectionner si les indentations incorrectes doivent être signalées</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/>
<source>Highlight bad indentation</source>
- <translation>Signale les mauvaises indentations</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
+ <translation type="obsolete">Signale les mauvaises indentations</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/>
<source>Select whether text should be autoindented after a ':'</source>
<translation>Indique si le texte doit être automatiquement indenté après ":"</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/>
<source>Auto indentation after ':'</source>
<translation>Auto-indentation après ':'</translation>
</message>
@@ -12322,42 +12322,42 @@
<translation>Contraction des chaines de caractères</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="797"/>
<source>SQL Lexer Properties</source>
<translation>Configuration du SQL</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="819"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="833"/>
<source>Select to enable Backslash Escapes</source>
<translation>Cocher pour activer l'échappement avec Backslash</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/>
<source>Backslash Escapes</source>
<translation>Echappement avec Backslash</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="920"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="934"/>
<source>VHDL Lexer Properties</source>
<translation>Configuration pour VHLD</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="926"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="940"/>
<source>Select whether folding of blocks at a parenthesis shall be possible</source>
<translation>Cocher pour plier le code entre des parenthèses quand c'est possible</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="929"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="943"/>
<source>Fold at parenthesis</source>
<translation>Contraction du code entre les parenthèses</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="936"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="950"/>
<source>Select whether folding of begin blocks shall be possible</source>
<translation>Cocher pour plier le code entre les blocs begin quand c'est possible</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="939"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="953"/>
<source>Fold at begin</source>
<translation>Contraction du code entre les "begin"</translation>
</message>
@@ -12392,7 +12392,7 @@
<translation>Sélectionne les niveau de PostScript</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="969"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
<source>YAML Lexer Properties</source>
<translation>Configuration de YAML</translation>
</message>
@@ -12472,32 +12472,32 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
+ <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+ <source>Allow v2 unicode string literals</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+ <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+ <source>Allow v3 binary and octal literals</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
- <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source>
+ <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
- <source>Allow v2 unicode string literals</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
- <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
- <source>Allow v3 binary and octal literals</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
- <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
<source>Allow v3 bytes string literals</source>
<translation type="unfinished"></translation>
</message>
@@ -12557,87 +12557,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
<source>Select to allow strings to span newline characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
<source>Strings may span newline characters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="778"/>
<source>Ruby Lexer Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="809"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="823"/>
<source>Select whether only BEGIN blocks can be folded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="826"/>
<source>Only BEGIN blocks can be folded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="829"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="843"/>
<source>Select if words may contain dots</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="832"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="846"/>
<source>Words may contain dots</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="839"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/>
<source>Select to allow '#' as a comment character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="842"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
<source>Allow '#' as comment character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="849"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/>
<source>Select to enable quoted identifiers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="852"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
<source>Enable quoted identifiers</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="862"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/>
<source>TCL Lexer Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="881"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
<source>TeX Lexer Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="897"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="911"/>
<source>Select to treat comments as TeX source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="900"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="914"/>
<source>Treat comments as TeX source</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="907"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="921"/>
<source>Select to treat \if<unknown> as a command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="910"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="924"/>
<source>Treat \if<unknown> as command</source>
<translation type="unfinished"></translation>
</message>
@@ -12647,7 +12647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
<source>Highlight sub-identifiers</source>
<translation type="unfinished"></translation>
</message>
@@ -12657,7 +12657,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
<source>Select to highlight sub-identifiers defined in keyword set 2</source>
<translation type="unfinished"></translation>
</message>
@@ -12711,6 +12711,36 @@
<source>CoffeeScript</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
+ <source>Highlight bad indentation:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/>
+ <source>No Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/>
+ <source>Inconsistent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/>
+ <source>Tabs after Spaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/>
+ <source>Spaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/>
+ <source>Tabs</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorSearchPage</name>
