Mercurial Repositories > eric / changeset
changeset
Updated translations.
Sat, 26 Jul 2014 12:08:31 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 26 Jul 2014 12:08:31 +0200
- changeset 3731
- 4d73662b6811
- parent 3730
- dccee91e9d8a
- child 3734
- e642b2099fc8
Updated translations.
| 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_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/i18n/eric6_cs.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_cs.ts Sat Jul 26 12:08:31 2014 +0200 @@ -5123,7 +5123,7 @@ <translation>změněno</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>Spojení z ilegálního hosta</translation> </message> @@ -5138,7 +5138,7 @@ <translation type="obsolete">Spojení pasivního debugeru uzavřeno</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> @@ -5147,18 +5147,18 @@ </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><p>Pokus o spojení z ilegálního hosta <b>{0}</b>. Přijmout toto spojení?</p></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> @@ -5887,12 +5887,12 @@ <translation>Stav</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>čekající na breakpoint</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>běžící</translation> </message> @@ -11335,12 +11335,12 @@ <translation>Bash Lexer vlastnosti</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>Vybrat, jestliže je možné skládat komentáře</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Skládat komentáře</translation> </message> @@ -11370,12 +11370,12 @@ <translation>Odsadit levé složené závorky</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>Vybrat, jestliže je možné skládat výrazy else</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>Skládat else</translation> </message> @@ -11455,22 +11455,22 @@ <translation>Python Lexer vlastnosti</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>Vybrat, má-li se zvýraznit chybné odsazení</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> <source>Highlight bad indentation</source> - <translation>Zvýraznit chybné odsazení</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <translation type="obsolete">Zvýraznit chybné odsazení</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Vybrat, má-li se text automaticky odsadit po ':'</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>Automatické odsazení po ':'</translation> </message> @@ -11485,42 +11485,42 @@ <translation>Skládat stringy</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>SQL Lexer vlastnosti</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>Vybrat pro aktivaci backslash escape sekvencí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation>Escape sekvence</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>VHDL Lexer vlastnosti</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>Vybrat jestliže je možné skládání bloků na závorkách</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>Skládat na závorkách</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>Vybrat jestliže je možné skládání začátků bloků</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>Skládat na začátku</translation> </message> @@ -11555,7 +11555,7 @@ <translation>Vybrat PostScript úroveň</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>YAML Lexer vlastnosti</translation> </message> @@ -11635,32 +11635,32 @@ <translation>Skládat POD bloky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Vybrat pro umožnění Python v2 unicode string literály (např. u"utf8")</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Allow v2 unicode string literals</source> + <translation>Povolit v2 unicode string literály</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>Vybrat pro povolení Python v3 binárních a oktalových literálů (např. 0b1011, 0o712)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <source>Allow v3 binary and octal literals</source> + <translation>Povolit v3 binární a oktalové literály</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation>Povolit Python v3 bytové string literály (např. b"bytes")</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> - <source>Allow v2 unicode string literals</source> - <translation>Povolit v2 unicode string literály</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>Vybrat pro povolení Python v3 binárních a oktalových literálů (např. 0b1011, 0o712)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> - <source>Allow v3 binary and octal literals</source> - <translation>Povolit v3 binární a oktalové literály</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>Povolit Python v3 bytové string literály (např. b"bytes")</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> <source>Allow v3 bytes string literals</source> <translation>Povolit v3 bytové string literály</translation> </message> @@ -11720,87 +11720,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> @@ -11810,7 +11810,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> @@ -11820,7 +11820,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> @@ -11874,6 +11874,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">Taby</translation> + </message> </context> <context> <name>EditorSearchPage</name>
--- a/i18n/eric6_de.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_de.ts Sat Jul 26 12:08:31 2014 +0200 @@ -4841,12 +4841,12 @@ <translation>geändert</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>Verbindung von ungültigem Rechner</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> @@ -4855,19 +4855,19 @@ </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><p>Es wurde versucht, eine Verbindung von dem nicht zugelassenen Rechner <b>{0}</b> aufzubauen. Soll die Verbindung angenommen werden?</p></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1461"/> + <location filename="../Debugger/DebugServer.py" line="1463"/> <source>Passive debug connection received </source> <translation>Verbindung für passives Debuggen empfangen </translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1475"/> + <location filename="../Debugger/DebugServer.py" line="1477"/> <source>Passive debug connection closed </source> <translation>Verbindung für passives Debuggen geschlossen @@ -5579,12 +5579,12 @@ <translation>Status</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>am Haltepunkt wartend</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>ausführend</translation> </message> @@ -10732,12 +10732,12 @@ <translation>Bash-Lexereinstellungen</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>Wähle aus, ob die Faltung von Kommentaren möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Kommentare falten</translation> </message> @@ -10767,12 +10767,12 @@ <translation>Öffnende geschweifte Klammer einrücken</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>Wähle aus, ob die Faltung bei Else möglich sein soll</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>Bei Else falten</translation> </message> @@ -10852,22 +10852,17 @@ <translation>Python-Lexereinstellungen</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>Wähle aus, ob fehlerhafte Einrückungen hervorgehoben werden sollen</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> + <source>Select whether text should be autoindented after a ':'</source> + <translation>Wähle aus, ob Text nach einem „:“ automatisch eingerückt werden soll</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> - <source>Highlight bad indentation</source> - <translation>Fehlerhafte Einrückung hervorheben</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> - <source>Select whether text should be autoindented after a ':'</source> - <translation>Wähle aus, ob Text nach einem „:“ automatisch eingerückt werden soll</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Auto indentation after ':'</source> <translation>Automatische Einrückung nach „:“</translation> </message> @@ -10882,42 +10877,42 @@ <translation>Zeichenketten falten</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>SQL-Lexereinstellungen</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>Auswählen, um „Backslash-Escapes“ zu aktivieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation>Backslash-Escapes</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>VHDL-Lexereinstellungen</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>Wähle aus, ob die Faltung von Blöcken an einer Klammer möglich sein soll</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>Bei Klammer falten</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>Wähle aus, ob die Faltung von Begin-Blöcken möglich sein soll</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>Bei Begin falten</translation> </message> @@ -10952,7 +10947,7 @@ <translation>Wähle das PostScript-Level aus</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>YAML-Lexereinstellungen</translation> </message> @@ -11032,32 +11027,32 @@ <translation>POD-Blöcke falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Auswählen, um Python 2-Unicode-Zeichenketten (z.B. u"utf8") zuzulassen</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Allow v2 unicode string literals</source> + <translation>v2-Unicode-Zeichenketten zulassen</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>Auswählen, um Python 3-Binär- und -Oktalzahlen (z.B. 0b1011, 0o712) zuzulassen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <source>Allow v3 binary and octal literals</source> + <translation>v3-Binär- und -Oktalzahlen zulassen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation>Auswählen, um Python 3-Byte-Zeichenketten (z.B. b"bytes") zulassen</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> - <source>Allow v2 unicode string literals</source> - <translation>v2-Unicode-Zeichenketten zulassen</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>Auswählen, um Python 3-Binär- und -Oktalzahlen (z.B. 0b1011, 0o712) zuzulassen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> - <source>Allow v3 binary and octal literals</source> - <translation>v3-Binär- und -Oktalzahlen zulassen</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>Auswählen, um Python 3-Byte-Zeichenketten (z.B. b"bytes") zulassen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> <source>Allow v3 bytes string literals</source> <translation>v3-Bytes-Zeichenketten zulassen</translation> </message> @@ -11117,87 +11112,87 @@ <translation>Zeichenketten in dreifachen Anführungszeichen falten</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>Auswählen, wenn Zeichenketten über das Zeilenendezeichen hinausgehen dürfen</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>Zeichenketten können Zeilenendezeichen überspannen</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>Ruby-Lexereinstellungen</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>Auswählen, wenn nur BEGIN-Blöcke gefaltet werden sollen</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>Faltung nur für BEGIN-Blöcke</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>Auswählen, wenn Worte Punkte enthalten dürfen</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>Worte dürfen Punkte enthalten</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>Auswählen, um „#“ als Kommentarzeichen zuzulassen</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>„#“ als Kommentarzeichen zulassen</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>Auswählen, um Bezeichner in Anführungszeichen zu aktivieren</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>Bezeichner in Anführungszeichen zulassen</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>TCL-Lexereinstellungen</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>TeX-Lexereinstellungen</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>Auswählen, um Kommentare wie TeX-Quelltext zu behandeln</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>Behandle Kommentare als TeX-Quelltext</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>Auswählen, um \if<unknown> als Kommando zu behandeln</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>Behandle \if<unknown> als Kommando</translation> </message> @@ -11207,7 +11202,7 @@ <translation>Zeichenketten in dreifachen Anführungszeichen hervorheben</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>Unteridentifizierer hervorheben</translation> </message> @@ -11217,7 +11212,7 @@ <translation>Auswählen, um Zeichenketten in dreifachen Anführungszeichen hervorzuheben</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>Auswählen, um in Schlüsselwortgruppe 2 definierte Unteridentifizierer hervorzuheben</translation> </message> @@ -11271,6 +11266,36 @@ <source>CoffeeScript</source> <translation>CoffeeScript</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> + <source>Highlight bad indentation:</source> + <translation>Fehlerhafte Einrückung hervorheben:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/> + <source>No Warning</source> + <translation>keine Warnung</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/> + <source>Inconsistent</source> + <translation>Inkonsistent</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/> + <source>Tabs after Spaces</source> + <translation>Tabulatoren nach Leerzeichen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/> + <source>Spaces</source> + <translation>Leerzeichen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="195"/> + <source>Tabs</source> + <translation>Tabulatoren</translation> + </message> </context> <context> <name>EditorSearchPage</name>
--- a/i18n/eric6_en.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_en.ts Sat Jul 26 12:08:31 2014 +0200 @@ -4795,30 +4795,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation type="unfinished"></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="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </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> @@ -5527,12 +5527,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> @@ -10645,12 +10645,12 @@ <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation type="unfinished"></translation> </message> @@ -10660,12 +10660,12 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -10870,16 +10870,11 @@ <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> - <source>Highlight bad indentation</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="671"/> <source>Select whether folding of strings shall be possible</source> <translation type="unfinished"></translation> @@ -10890,87 +10885,87 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> + <source>Select whether text should be autoindented after a ':'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> + <source>Auto indentation after ':'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> - <source>Select whether text should be autoindented after a ':'</source> + <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>Auto indentation after ':'</source> + <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> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="797"/> <source>SQL Lexer Properties</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -11030,87 +11025,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> @@ -11120,7 +11115,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> @@ -11130,7 +11125,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> @@ -11184,6 +11179,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>
--- a/i18n/eric6_es.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_es.ts Sat Jul 26 12:08:31 2014 +0200 @@ -4844,31 +4844,31 @@ <translation>cambiado</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>Conexión desde un host ilegal</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> <translation>No conectado</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><p>Se ha intentado una conexión desde el host ilegal <b>{0}</b>. ¿Aceptar esta conexión?.</p></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1461"/> + <location filename="../Debugger/DebugServer.py" line="1463"/> <source>Passive debug connection received </source> <translation>Recibida conexión pasiva de depuración </translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1475"/> + <location filename="../Debugger/DebugServer.py" line="1477"/> <source>Passive debug connection closed </source> <translation>Cerrada conexión pasiva de depuración @@ -5580,12 +5580,12 @@ <translation>Estado</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>esperando en el punto de ruptura</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>en ejecución</translation> </message> @@ -10759,12 +10759,12 @@ <translation>Analizador léxico de 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>Seleccionar si el plegado de comentarios será posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Plegado de comentarios</translation> </message> @@ -10794,12 +10794,12 @@ <translation>Indentar al abrir llave ('{')</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>Seleccionar si el plegado en las sentencias else debe ser posible</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>Plegado en los else</translation> </message> @@ -10879,22 +10879,22 @@ <translation>Propiedades del Analizador Léxico de 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>Seleccionar si la indentación errónea debe ser resaltada</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> <source>Highlight bad indentation</source> - <translation>Resaltar indentación errónea</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <translation type="obsolete">Resaltar indentación errónea</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Seleccionar si el texto se debe autoindentar despues de un ':'</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>Autoindentación despues de ':'</translation> </message> @@ -10909,42 +10909,42 @@ <translation>Plegado de cadenas</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>Propiedades del Analizador Léxico de 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>Seleccionar hara habilitar secuencias de Escape con 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>Secuencias de Escape con 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>Propiedades del Analizador Léxico de VHDL</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>Seleccionar si el plegado de bloques en los paréntesis debe ser posible</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>Plegar en los paréntesis</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>Selecciona si el plegado de bloques begin debe ser posible</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>Plegar en begin</translation> </message> @@ -10979,7 +10979,7 @@ <translation>Seleccione el nivel 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>Propiedades del Analizador Léxico de YAML</translation> </message> @@ -11059,32 +11059,32 @@ <translation>Plegado de bloques POD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Seleccionar para permitir literales de cadena unicode Python v2 (p. e. u"utf8")</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Allow v2 unicode string literals</source> + <translation>Permitir literales de cadena unicode v2</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>Seleccionar para permitir literales binarios y octales Python v3 (p. e. 0b1011, 0o712)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <source>Allow v3 binary and octal literals</source> + <translation>Permitir literales binarios y octales v3</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation>Seleccionar para permitir literales de cadena de bytes Python v3 (p. e. b"bytes")</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> - <source>Allow v2 unicode string literals</source> - <translation>Permitir literales de cadena unicode v2</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>Seleccionar para permitir literales binarios y octales Python v3 (p. e. 0b1011, 0o712)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> - <source>Allow v3 binary and octal literals</source> - <translation>Permitir literales binarios y octales v3</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>Seleccionar para permitir literales de cadena de bytes Python v3 (p. e. b"bytes")</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> <source>Allow v3 bytes string literals</source> <translation>Permitir literales de cadena de bytes v3</translation> </message> @@ -11144,87 +11144,87 @@ <translation>Plegado de cadenas de triple comilla</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>Seleccionar para permitir a las cadenas generar caracteres de nueva línea</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>Las cadenas pueden generar caracteres de nueva línea</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>Propiedades del Analizador Léxico de Ruby</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>Selecciona si solamente los bloques BEGIN pueden ser plegados</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>Solamente los bloques BEGIN pueden ser plegados</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>Seleccionar si las palabras pueden contener puntos</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>Las palabras pueden contener puntos</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>Seleccionar para permitir '#' como carácter de comentario</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>Permitir '#' como carácter de comentario</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>Seleccionar para habilitar identificadores entre comillas</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>Habilitar identificadores entre comillas</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>Propiedades del Analizador Léxico de TCL</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>Propiedades del Analizador Léxico de TeX</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>Seleccionar para tratar comentarios como fuente TeX</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>Tratar comentarios como fuente TeX</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>Seleccionar para tratar \if<unknown> como un comando</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>Tratar \if<unknown> como comando</translation> </message> @@ -11234,7 +11234,7 @@ <translation>Resaltar cadenas de triple comilla</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>Resaltar sub-identificadores</translation> </message> @@ -11244,7 +11244,7 @@ <translation>Seleccionar para resaltar cadenas de triple comilla</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>Seleccionar para resaltar sub-identificadores definidos en el conjunto de palabras clave 2</translation> </message> @@ -11298,6 +11298,36 @@ <source>CoffeeScript</source> <translation>CoffeeScript</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">Pestañas</translation> + </message> </context> <context> <name>EditorSearchPage</name>
--- 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>
--- a/i18n/eric6_it.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_it.ts Sat Jul 26 12:08:31 2014 +0200 @@ -5378,30 +5378,30 @@ <translation>modificato</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>Connessione da un non vietato</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> <translation>Non connesso</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><p>Una connessione è stata tentata da un host vietato <b>{0}</b>. Accettare questa connessione ?</p></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> @@ -6130,12 +6130,12 @@ <translation>Stato</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>in attesa ad un breakpoint</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>in esecuzione</translation> </message> @@ -11543,12 +11543,12 @@ <translation>Proprietà analizzatore lessicale della 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>Selezione quando la compressione dei commenti deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Comprimi commenti</translation> </message> @@ -11578,12 +11578,12 @@ <translation>Indenta la parentesi aperta</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>Selezione nel caso la compressione al costrutto else deve essere possibile</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>Comprimi all'else</translation> </message> @@ -11663,22 +11663,22 @@ <translation>Proprietà analizzatore lessicale di 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>Seleziona quando una errata indentazione deve essere evidenziata</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> <source>Highlight bad indentation</source> - <translation>Evidenzia indentazione errata</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <translation type="obsolete">Evidenzia indentazione errata</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Seleziona quando un testo deve essere indentato automaticamente dopo i ':'</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>Indenta automaticamento dopo ':'</translation> </message> @@ -11693,42 +11693,42 @@ <translation>Comprimi stringhe</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>Proprietà analizzatore lessicale dell'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>Seleziona per abilitare i Backslash Escapes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation>Backslash Escapes</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>Proprietà analizzatore lessicale di VHDL</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>Selezione se la compressione di blocchi alla parentesi deve essere possibile</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>Comprimi alle parentesi</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>Seleziona se la compressione all'inizio dei blocchi deve essere possibile</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>Comprimi all'inizio</translation> </message> @@ -11763,7 +11763,7 @@ <translation>Selezione il PostScript level</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>Proprietà analizzatore lessicale di YAML</translation> </message> @@ -11843,32 +11843,32 @@ <translation>Comprimi blocchi POD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Seleziona per permettere caratteri unicode Python v2 (es. u"utf8")</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Allow v2 unicode string literals</source> + <translation>Permetti caratteri unicode v2</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>Seleziona per permettere caratteri binari e ottali Python v3 (es. 0b1011, 0o712)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <source>Allow v3 binary and octal literals</source> + <translation>Consenti caratteri binari e ottali v3</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation>Seleziona per permettere byte Python v3 (es. b"bytes")</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> - <source>Allow v2 unicode string literals</source> - <translation>Permetti caratteri unicode v2</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>Seleziona per permettere caratteri binari e ottali Python v3 (es. 0b1011, 0o712)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> - <source>Allow v3 binary and octal literals</source> - <translation>Consenti caratteri binari e ottali v3</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>Seleziona per permettere byte Python v3 (es. b"bytes")</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> <source>Allow v3 bytes string literals</source> <translation>Permetti byte unicode v3</translation> </message> @@ -11928,87 +11928,87 @@ <translation>Racchiudi stringhe tra virgolette triple</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>Seleziona per permettere alle stringhe di unire i caratteri a capo</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>Le stringhe possono congiungere i caratteri a capo</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>Proprietà dell'analizzatore lessicale Ruby</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>Seleziona se i soli blocchi BEGIN possono essere congiunti</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>Solo i blocchi BEGIN possono venir congiunti</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>Seleziona se le voci possono contenere punti</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>Le vosi possono contenere punti</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>Seleziona per consentire '#' come carattere di commento</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>Consenti '#' come carattere di commento</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>Seleziona per abilitare identificatore tra virgolette</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>Abilita identificatori tra virgolette</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>Proprietà dell'analizzatore lessicale TCL</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>Proprietà dell'analizzatore lessicale TeX</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>Seleziona per gestire i commenti come sorgenti TeX</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>Gestisci i commenti come sorgenti TeX</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>Seleziona per gestire \if<unknown> come un comando</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>Gestisci \if<unknown> come un comando</translation> </message> @@ -12018,7 +12018,7 @@ <translation>Evidenzia stringhe tra virgolette triple</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>Evidenzia sotto-identificatori</translation> </message> @@ -12028,7 +12028,7 @@ <translation>Seleziona per evidenziare stringhe tra virgolette triple</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>Seleziona per evidenziare i sotto-identificatori definiti nell'insieme 2 di parole-chiave</translation> </message> @@ -12082,6 +12082,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">Schede</translation> + </message> </context> <context> <name>EditorSearchPage</name>
--- a/i18n/eric6_ru.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_ru.ts Sat Jul 26 12:08:31 2014 +0200 @@ -5389,30 +5389,30 @@ <translation>изменено</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>соединение с запрещённого хоста</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> <translation>Нет соединения</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><p>Попытка соединения с недопустимого компьютора <b>{0}</b>. Разрешить соединение?</p></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> @@ -6162,12 +6162,12 @@ <translation>Состояние</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>В точке останова</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>Выполяется</translation> </message> @@ -11602,12 +11602,12 @@ <translation>Свойства лексического анализатора 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>Возможно ли сворачивать комментарии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Сворачивать комментарии</translation> </message> @@ -11637,12 +11637,12 @@ <translation>Выравнивать открывающую скобку</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>Возможно ли сворачивать оператор else</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>Сворачивать else</translation> </message> @@ -11722,22 +11722,22 @@ <translation>Свойства лексического анализатора 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>Разрешить/запретить подсветку неверных отступов</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> <source>Highlight bad indentation</source> - <translation>Подсвечивать неверные отступы</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <translation type="obsolete">Подсвечивать неверные отступы</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Нужно ли автоматически выравнивать текст (с отступом) после ':'</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>Автоотступ после ':'</translation> </message> @@ -11752,42 +11752,42 @@ <translation>Сворачивать строки</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>Свойства лексического анализатора 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>Включить экранирование обратной косой</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation>Экранирование обратной косой</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>Свойства лексического анализатора VHDL</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>Возможно ли сворачивать блоки в круглых скобках</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>Сворачивать круглые скобки</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>Возможно ли сворачивать блоки begin</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>Сворачивать begin</translation> </message> @@ -11822,7 +11822,7 @@ <translation>Выбрать PostScript level</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>Свойства лексического анализатора YAML</translation> </message> @@ -11902,32 +11902,32 @@ <translation>Сворачивать POD блоки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Разрешить Python2 юникодные литералы (например u"utf8")</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Allow v2 unicode string literals</source> + <translation>Разрешить Python2 юникодные литералы</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>Разрешить Python3 двоичные и восьмеричные литералы (например 0b1011, 0o712)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <source>Allow v3 binary and octal literals</source> + <translation>Разрешить Python3 двоичные и восьмеричные литералы</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation>Разрешить Python3 байтовые литералы (например b"bytes")</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> - <source>Allow v2 unicode string literals</source> - <translation>Разрешить Python2 юникодные литералы</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>Разрешить Python3 двоичные и восьмеричные литералы (например 0b1011, 0o712)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> - <source>Allow v3 binary and octal literals</source> - <translation>Разрешить Python3 двоичные и восьмеричные литералы</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>Разрешить Python3 байтовые литералы (например b"bytes")</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> <source>Allow v3 bytes string literals</source> <translation>Разрешить Python3 байтовые литералы</translation> </message> @@ -11987,87 +11987,87 @@ <translation>Сворачивать строки с тройными кавычками</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>Выберите, чтобы разрешить завершение строки символом новой строки</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>Строка может быть завершена символом новой строки</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>Свойства лексического анализатора Ruby</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>Разрешить сворачивание только BEGIN блоков</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>Только BEGIN блоки могут быть свернуты</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>Разрешить словам содержать точки</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>Слова могут содержать точки</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>Разрешить символ '#' как символ коментариев</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>Разрешить символ '#' как символ коментариев</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>Разрешить заключать в кавычки идентификаторы</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>Разрешить заключать в кавычки идентификаторы</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>Свойства лексического анализатора TCL</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>Свойства лексического анализатора TeX</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>Считать коментарии как TeX код</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>Считать коментарии как TeX код</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>Считать \if<unknown>командой</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>Считать \if<unknown>командой</translation> </message> @@ -12077,7 +12077,7 @@ <translation>Выделять строки с тройными кавычками</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>Выделять суб-идентификаторы</translation> </message> @@ -12087,7 +12087,7 @@ <translation>Разрешить выделение строк с тройными кавычками</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>Разрешить выделять суб-идентификаторы определенные в ключе set 2</translation> </message> @@ -12141,6 +12141,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>
--- a/i18n/eric6_tr.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_tr.ts Sat Jul 26 12:08:31 2014 +0200 @@ -5128,17 +5128,17 @@ <translation>değişti</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>Yasal olmayan bir host tan balğlantı</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><p><b>{0}</b>kaçak bir barındırıcıdan (host) bağlantı denemesi. Bu bağlantıyı kabul ediyor musunuz?</p></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> @@ -5157,13 +5157,13 @@ <translation type="obsolete">Pasif Hata Ayıklama bağlantısı kapatıldı</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> @@ -5882,12 +5882,12 @@ <translation>Durum</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="519"/> + <location filename="../Debugger/DebugViewer.py" line="520"/> <source>waiting at breakpoint</source> <translation>Bekleme oktasında bekleniyor</translation> </message> <message> - <location filename="../Debugger/DebugViewer.py" line="521"/> + <location filename="../Debugger/DebugViewer.py" line="522"/> <source>running</source> <translation>çalışıyor</translation> </message> @@ -11339,12 +11339,12 @@ <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>Katlanmış yorumlama</translation> </message> @@ -11354,12 +11354,12 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -11564,16 +11564,11 @@ <translation>Python Dil Özillikleri</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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> - <source>Highlight bad indentation</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="671"/> <source>Select whether folding of strings shall be possible</source> <translation type="unfinished"></translation> @@ -11584,87 +11579,87 @@ <translation>Katlanmış metin</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> + <source>Select whether text should be autoindented after a ':'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> + <source>Auto indentation after ':'</source> + <translation>':' den sonra Otomatik Girintileme</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> - <source>Select whether text should be autoindented after a ':'</source> + <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>Auto indentation after ':'</source> - <translation>':' den sonra Otomatik Girintileme</translation> + <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> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="797"/> <source>SQL Lexer Properties</source> <translation>SQL Dili Özellikleri</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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Parentezleri katla</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 type="unfinished"></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>Başlangıçta katlı</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>YAML Lexer Özellikleri</translation> </message> @@ -11724,87 +11719,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> @@ -11814,7 +11809,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> @@ -11824,7 +11819,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> @@ -11878,6 +11873,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">Sekmeler</translation> + </message> </context> <context> <name>EditorSearchPage</name>
--- a/i18n/eric6_zh_CN.GB2312.ts Sat Jul 26 12:05:01 2014 +0200 +++ b/i18n/eric6_zh_CN.GB2312.ts Sat Jul 26 12:08:31 2014 +0200 @@ -5237,7 +5237,7 @@ <translation>改变</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="679"/> + <location filename="../Debugger/DebugServer.py" line="681"/> <source>Connection from illegal host</source> <translation>连接非法主机</translation> </message> @@ -5247,7 +5247,7 @@ <translation type="obsolete"><p>非法主机 <b>%1</b> 试图进行连接。同意连接？</p></translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1281"/> + <location filename="../Debugger/DebugServer.py" line="1283"/> <source> Not connected </source> @@ -5266,18 +5266,18 @@ <translation type="obsolete">关闭被动调试连接</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> @@ -6111,12 +6111,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> @@ -11875,12 +11875,12 @@ <translation>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>选择是否折叠注释</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="978"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="992"/> <source>Fold comments</source> <translation>折叠注释</translation> </message> @@ -11910,12 +11910,12 @@ <translation>缩进开放花括号</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>选择是否折叠其它语句</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>折叠其它</translation> </message> @@ -12025,22 +12025,22 @@ <translation>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>选择是否高亮不良缩进</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/> <source>Highlight bad indentation</source> - <translation>高亮不良缩进</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <translation type="obsolete">高亮不良缩进</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/> <source>Select whether text should be autoindented after a ':'</source> <translation>选择是否自动缩进“：”之后的文本</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>“：”之后自动缩进</translation> </message> @@ -12055,47 +12055,47 @@ <translation>折叠字符串</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>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>选择开启反斜杠转义</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="836"/> <source>Backslash Escapes</source> <translation>反斜杠转义</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>VHDL 词法分析器属性</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>选择是否折叠圆括号部分</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>折叠圆括号</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>选择是否折叠开始部分</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>折叠开始部分</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>YAML 词法分析器属性</translation> </message> @@ -12175,32 +12175,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> @@ -12260,87 +12260,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> @@ -12350,7 +12350,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> @@ -12360,7 +12360,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> @@ -12414,6 +12414,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>
