Sat, 16 Oct 2010 20:28:00 +0200
Added a check to the find and replace dialog to make sure, that no external changes were done between the find run and the replace run.
--- a/APIs/Python3/eric5.api Sat Oct 16 19:18:43 2010 +0200 +++ b/APIs/Python3/eric5.api Sat Oct 16 20:28:00 2010 +0200 @@ -5771,6 +5771,7 @@ eric5.UI.FindFileDialog.FindFileDialog.designerFile?7 eric5.UI.FindFileDialog.FindFileDialog.endRole?7 eric5.UI.FindFileDialog.FindFileDialog.lineRole?7 +eric5.UI.FindFileDialog.FindFileDialog.md5Role?7 eric5.UI.FindFileDialog.FindFileDialog.on_buttonBox_clicked?4(button) eric5.UI.FindFileDialog.FindFileDialog.on_dirButton_clicked?4() eric5.UI.FindFileDialog.FindFileDialog.on_dirCombo_editTextChanged?4(text) @@ -6201,6 +6202,7 @@ eric5.Utilities.py3flakes.messages.UnusedVariable.message?7 eric5.Utilities.py3flakes.messages.UnusedVariable?1(filename, lineno, name) eric5.Utilities.readEncodedFile?4(filename) +eric5.Utilities.readEncodedFileWithHash?4(filename) eric5.Utilities.relpath?4(path, start = os.path.curdir) eric5.Utilities.samepath?4(f1, f2) eric5.Utilities.setConfigDir?4(d)
--- a/Documentation/Help/source.qhp Sat Oct 16 19:18:43 2010 +0200 +++ b/Documentation/Help/source.qhp Sat Oct 16 20:28:00 2010 +0200 @@ -2372,6 +2372,7 @@ <keyword name="pwDecode" id="pwDecode" ref="eric5.Utilities.__init__.html#pwDecode" /> <keyword name="pwEncode" id="pwEncode" ref="eric5.Utilities.__init__.html#pwEncode" /> <keyword name="readEncodedFile" id="readEncodedFile" ref="eric5.Utilities.__init__.html#readEncodedFile" /> + <keyword name="readEncodedFileWithHash" id="readEncodedFileWithHash" ref="eric5.Utilities.__init__.html#readEncodedFileWithHash" /> <keyword name="relpath" id="relpath" ref="eric5.Utilities.__init__.html#relpath" /> <keyword name="samepath" id="samepath" ref="eric5.Utilities.__init__.html#samepath" /> <keyword name="setConfigDir" id="setConfigDir" ref="eric5.Utilities.__init__.html#setConfigDir" />
--- a/Documentation/Source/eric5.UI.FindFileDialog.html Sat Oct 16 19:18:43 2010 +0200 +++ b/Documentation/Source/eric5.UI.FindFileDialog.html Sat Oct 16 20:28:00 2010 +0200 @@ -62,7 +62,7 @@ QDialog, Ui_FindFileDialog <h3>Class Attributes</h3> <table> -<tr><td>designerFile</td></tr><tr><td>endRole</td></tr><tr><td>lineRole</td></tr><tr><td>replaceRole</td></tr><tr><td>sourceFile</td></tr><tr><td>startRole</td></tr> +<tr><td>designerFile</td></tr><tr><td>endRole</td></tr><tr><td>lineRole</td></tr><tr><td>md5Role</td></tr><tr><td>replaceRole</td></tr><tr><td>sourceFile</td></tr><tr><td>startRole</td></tr> </table> <h3>Methods</h3> <table> @@ -164,7 +164,7 @@ Private method to copy the path of an entry to the clipboard. </p><a NAME="FindFileDialog.__createItem" ID="FindFileDialog.__createItem"></a> <h4>FindFileDialog.__createItem</h4> -<b>__createItem</b>(<i>file, line, text, start, end, replTxt = ""</i>) +<b>__createItem</b>(<i>file, line, text, start, end, replTxt = "", md5 = ""</i>) <p> Private method to create an entry in the file list. </p><dl> @@ -185,7 +185,10 @@ end position of match (integer) </dd><dt><i>replTxt</i></dt> <dd> -text with replacements applied (string +text with replacements applied (string) +</dd><dt><i>md5=</i></dt> +<dd> +MD5 hash of the file (string) </dd> </dl><a NAME="FindFileDialog.__doSearch" ID="FindFileDialog.__doSearch"></a> <h4>FindFileDialog.__doSearch</h4>
--- a/Documentation/Source/eric5.Utilities.__init__.html Sat Oct 16 19:18:43 2010 +0200 +++ b/Documentation/Source/eric5.Utilities.__init__.html Sat Oct 16 20:28:00 2010 +0200 @@ -185,6 +185,9 @@ <td><a href="#readEncodedFile">readEncodedFile</a></td> <td>Function to read a file and decode it's contents into proper text.</td> </tr><tr> +<td><a href="#readEncodedFileWithHash">readEncodedFileWithHash</a></td> +<td>Function to read a file, calculate a hash value and decode it's contents into proper text.</td> +</tr><tr> <td><a href="#relpath">relpath</a></td> <td>Return a relative version of a path.</td> </tr><tr> @@ -1192,6 +1195,25 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="readEncodedFileWithHash" ID="readEncodedFileWithHash"></a> +<h2>readEncodedFileWithHash</h2> +<b>readEncodedFileWithHash</b>(<i>filename</i>) +<p> + Function to read a file, calculate a hash value and decode it's contents + into proper text. +</p><dl> +<dt><i>filename</i></dt> +<dd> +name of the file to read (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of decoded text, encoding and hash value (string, string, string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="relpath" ID="relpath"></a> <h2>relpath</h2> <b>relpath</b>(<i>path, start = os.path.curdir</i>)
--- a/UI/FindFileDialog.py Sat Oct 16 19:18:43 2010 +0200 +++ b/UI/FindFileDialog.py Sat Oct 16 20:28:00 2010 +0200 @@ -39,6 +39,7 @@ startRole = Qt.UserRole + 2 endRole = Qt.UserRole + 3 replaceRole = Qt.UserRole + 4 + md5Role = Qt.UserRole + 5 def __init__(self, project, replaceMode = False, parent=None): """ @@ -115,7 +116,7 @@ self.setContextMenuPolicy(Qt.CustomContextMenu) self.customContextMenuRequested.connect(self.__contextMenuRequested) - def __createItem(self, file, line, text, start, end, replTxt = ""): + def __createItem(self, file, line, text, start, end, replTxt = "", md5 = ""): """ Private method to create an entry in the file list. @@ -124,7 +125,8 @@ @param text text found (string) @param start start position of match (integer) @param end end position of match (integer) - @param replTxt text with replacements applied (string + @param replTxt text with replacements applied (string) + @keyparam md5 MD5 hash of the file (string) """ if self.__lastFileItem is None: # It's a new file @@ -136,6 +138,7 @@ Qt.ItemFlags(Qt.ItemIsUserCheckable | Qt.ItemIsTristate)) # Qt bug: # item is not user checkable if setFirstColumnSpanned is True (< 4.5.0) + self.__lastFileItem.setData(0, self.md5Role, md5) itm = QTreeWidgetItem(self.__lastFileItem, [' {0:5d} '.format(line), text]) itm.setTextAlignment(0, Qt.AlignRight) @@ -395,7 +398,7 @@ fn = file # read the file and split it into textlines try: - text, encoding = Utilities.readEncodedFile(fn) + text, encoding, hash = Utilities.readEncodedFileWithHash(fn) lines = text.splitlines() except (UnicodeError, IOError): progress += 1 @@ -423,7 +426,7 @@ if len(rline) > 1024: rline = "{0} ...".format(line[:1024]) line = "- {0}\n+ {1}".format(line, rline) - self.__createItem(file, count, line, start, end, rline) + self.__createItem(file, count, line, start, end, rline, hash) if self.feelLikeCheckBox.isChecked(): fn = os.path.join(self.project.ppath, file) @@ -542,6 +545,7 @@ itm = self.findList.topLevelItem(index) if itm.checkState(0) in [Qt.PartiallyChecked, Qt.Checked]: file = itm.text(0) + origHash = itm.data(0, self.md5Role) self.findProgressLabel.setPath(file) @@ -552,7 +556,7 @@ # read the file and split it into textlines try: - text, encoding = Utilities.readEncodedFile(fn) + text, encoding, hash = Utilities.readEncodedFileWithHash(fn) lines = text.splitlines() except (UnicodeError, IOError): E5MessageBox.critical(self, @@ -565,6 +569,20 @@ self.findProgress.setValue(progress) continue + # Check the original and the current hash. Skip the file, + # if hashes are different. + if origHash != hash: + E5MessageBox.critical(self, + self.trUtf8("Replace in Files"), + self.trUtf8("""<p>The current and the original hash of the""" + """ file <b>{0}</b> are different. Skipping it.""" + """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")\ + .format(fn, origHash, hash) + ) + progress += 1 + self.findProgress.setValue(progress) + continue + # replace the lines authorized by the user for cindex in range(itm.childCount()): citm = itm.child(cindex)
--- a/Utilities/__init__.py Sat Oct 16 19:18:43 2010 +0200 +++ b/Utilities/__init__.py Sat Oct 16 20:28:00 2010 +0200 @@ -39,8 +39,8 @@ from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32 -from PyQt4.QtCore import QRegExp, QDir, QProcess, Qt, \ - qVersion, PYQT_VERSION_STR, QCoreApplication +from PyQt4.QtCore import QRegExp, QDir, QProcess, Qt, QByteArray, \ + qVersion, PYQT_VERSION_STR, QCoreApplication, QCryptographicHash from PyQt4.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla from Globals import isWindowsPlatform # import this method into the Utilities namespace @@ -152,6 +152,21 @@ f.close() return decode(text) +def readEncodedFileWithHash(filename): + """ + Function to read a file, calculate a hash value and decode it's contents + into proper text. + + @param filename name of the file to read (string) + @return tuple of decoded text, encoding and hash value (string, string, string) + """ + f = open(filename, "rb") + text = f.read() + f.close() + hash = str(QCryptographicHash.hash(QByteArray(text), QCryptographicHash.Md5).toHex(), + encoding = "ASCII") + return decode(text) + (hash, ) + def decode(text): """ Function to decode some byte text into a string.
--- a/changelog Sat Oct 16 19:18:43 2010 +0200 +++ b/changelog Sat Oct 16 20:28:00 2010 +0200 @@ -8,6 +8,9 @@ - changed the web browser to give it a more modern look - added code to show certificate info for https URLs - added a download manager to the web browser +- added a check to the find and replace dialog to make sure, + that no external changes were done between the find run and + the replace run Version 5.1-snapshot-20100918: - bug fixes
--- a/i18n/eric5_cs.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_cs.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9095,117 +9095,117 @@ <translation><b>Konfigurace editoru stylů</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Fonty</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Vybrat, má-li být jako default použit neproporcioální font</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Neproporcionální font jako default</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Neproporcionální font jako default</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Defaultní text</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>Stisknout pro výběr defaultního fontu pro text editoru</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Font defaultního textu</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>Stisknout pro výběr fontu, který bude použit pro neproporcionální písmo</translation> + <source>Press to select the default font for the editor's text</source> + <translation>Stisknout pro výběr defaultního fontu pro text editoru</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Neproporcionální font</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> - <source>Press to select the font for the editor line numbers</source> - <translation>Stisknout pro výběr fontu pro na čísla řádků v editoru</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> - <source>Line Numbers Font</source> - <translation>Font čísel řádek</translation> + <source>Default Text Font</source> + <translation>Font defaultního textu</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>Stisknout pro výběr fontu, který bude použit pro neproporcionální písmo</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Neproporcionální font</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> + <source>Press to select the font for the editor line numbers</source> + <translation>Stisknout pro výběr fontu pro na čísla řádků v editoru</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> + <source>Line Numbers Font</source> + <translation>Font čísel řádek</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Neproporcionální text</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Okraje</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Vybrat má-li se zobrazovat sloupec s čísly řádků.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Zobrazit sloupec s čísly řádků</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Vybrat, jestliže se mají zobrazovat značky skládání.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Vybrat má-li se zobrazovat sloupec s čísly řádků.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Zobrazit sloupec s čísly řádků</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Vybrat, jestliže se mají zobrazovat značky skládání.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Zobrazovat značky skládání</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Šířka sloupce s čísly řádků:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Šířka sloupce s čísly řádků:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Posunout pro nastavení šířky sloupce s čísly řádků.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Zobrazuje vybranou šířku sloupce s čísly řádků.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Styl skládání:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Výběr stylu skládání, který bude použit ve sloupci se značkami skládání</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9220,405 +9220,410 @@ <translation><b>Styl skládání</b><p>Vyberte požadovaný styl skládání, který bude použit ve sloupci se značkami skládání.</p><p>Dostupné styly jsou:<li><ul>Jednoduché - jen symboly plus a mínus</ul><ul>Kolečka - symboly plus a mínus v kruhu</ul><ul>Čtverce - symboly plus a mínus ve čtvercích</ul><ul>Propojená kolečka - symboly plus a mínus v propojených kolečkách</ul<ul>Propojené čtverce - symboly plus a mínus v propojených čtvercích</ul></li></p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Jednoduché</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Kolečka</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Čtverce</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Propojená kolečka</translation> + <source>Circled</source> + <translation>Kolečka</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Čtverce</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Propojená kolečka</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Propojené čtverce</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Výběr</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Vybrat použití obvyklého výběru barev</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>Použít obvyklý výběr barev</b><p>Vyberte tento přepínač pokud v okně editoru a shellu chcete použít obvyklý typ barev. Barvy popředí a pozadí budou definovány barvami strany.</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Použít obvyklé barvy</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>Vybrat, jestliže má být vybraný text obarven lexerem.</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>Použít obvyklý výběr barev</b><p>Vyberte tento přepínač pokud v okně editoru a shellu chcete použít obvyklý typ barev. Barvy popředí a pozadí budou definovány barvami strany.</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Obarvit vybraný text</translation> + <source>Use custom selection colours</source> + <translation>Použít obvyklé barvy</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>Aktivovat výběr rozšířený o konec řádku</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>Vybrat, jestliže má být vybraný text obarven lexerem.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Obarvit vybraný text</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>Aktivovat výběr rozšířený o konec řádku</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Rozšířený výběr na konec řádku</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Výběr popředí:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Vybrat barvu popředí pro výběr.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Vybrat barvu popředí pro výběr.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Výběr pozadí:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Vybrat barvu pozadí pro výběr.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Karet (textový kurzor)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Vybrat, má-li být linka karetu zvýrazněna</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Zobrazení textového kurzoru</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Šířka text.kurzoru:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Výběr délky karetu (1, 2 nebo 3 pixelu)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Barva karetu:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Výběr barvy karetu.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Výběr barvy karetu.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Pozadí karetu:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Vybrat barvu pozadí pro řádku obsahující karet.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Značka aktuální řádky:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Vybrat barvu pro značku aktuální řádky.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Vybrat barvu pro značku aktuální řádky.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Značka chybné řádky:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Vybrat barvu pro značku chybné řádky.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Závorky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Vybrat, jestliže se má zkontrolovat párovost závorek a neplatné se mají zvýraznit.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Zvýraznit závorky</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Vybrat, jestliže se má zkontrolovat párovost závorek a neplatné se mají zvýraznit.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Zvýraznit závorky</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Párové závorky:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Výběr barvy pro zvýraznění párových závorek.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Výběr barvy pro zvýraznění párových závorek.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Pozadí párových závorek:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Výběr barvy pozadí pro zvýraznění párových závorek.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Nepárová závorka:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Výběr barvy pro zvýraznění nepárových závorek.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Pozadí nepárové závorky:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Vybrat barvu pozadí pro zvýraznění nepárových závorek.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Konec řádku</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Vybrat, mají-li se zobrazovat symboly konce řádků</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Zobrazovat konce řádků</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Vybrat, mají-li se dlouhé řádky zalamovat</translation> + <source>Select whether end of line shall be shown</source> + <translation>Vybrat, mají-li se zobrazovat symboly konce řádků</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Zobrazovat konce řádků</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Vybrat, mají-li se dlouhé řádky zalamovat</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Zalamovat dlouhé řádky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Mód okraje</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Vybrat barvu pro značku okraje.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Vybrat barvu pro značku okraje.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Barva pozadí:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Posunout pro nastavení sloupce okraje.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Zobrazuje vybranou šířku tabulátoru.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Číslo sloupce:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Mód:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Vypnuto</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Zobrazit linku</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Vypnuto</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Zobrazit linku</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Změnit barvu pozadí</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Různé</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Vybrat, mají-li se zobrazovat prázdné znaky</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Zobrazit prázdné znaky</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Vybrat pro zobrazení minimalistického kontextového menu</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Vybrat, mají-li se zobrazovat prázdné znaky</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Zobrazit prázdné znaky</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Vybrat pro zobrazení minimalistického kontextového menu</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Zobrazit minimální kontextové menu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Barva textu okrajů:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Vybrat barvu textu okrajů</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Vybrat barvu textu okrajů</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Barva pozadí okrajů:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Vybrat barvu pozadí okrajů</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Vybrat barvu pozadí okrajů</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Barava pozadí okraje skládání:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Vybrat barvu pozadí pro okraj se značkami skládání</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Vybrat zobrazení jednotných okrajů (jako eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Zobrazit jednotné okraje</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Značky debugované řádky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation>Lupa</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation>Úvodní nastavení lupy:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation>Úvodní nastavení lupy:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation>Posunout pro nastavení velikosti lupy</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation>Zobrazuje vybranou velikost lupy</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11346,17 +11351,17 @@ <translation>Text</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Hledat</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Výběr adresáře</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation></translation> </message> @@ -11411,7 +11416,7 @@ <translation>Nahradit</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Nahradit v souborech</translation> </message> @@ -11436,35 +11441,40 @@ <translation>Pocit jako</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation>Kopírovat cestu do schránky</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation>Neplatný výraz hledání</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Výraz hledná není platný. </p><p>Chyba: {0}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze číst ze souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -40089,7 +40099,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message>
--- a/i18n/eric5_de.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_de.ts Sat Oct 16 20:28:00 2010 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="de"> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1577,8 +1578,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="139"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> @@ -1628,7 +1629,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -8987,117 +8988,117 @@ <translation><b>Editor Stile einstellen</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Schriftarten</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Wähle, ob der Monospace Font als Standard benutzt werden soll</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Benutze Monospace Font als Standard</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Benutze Monospace Font als Standard</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Standardtext</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>Drücken, um den Standardfont für den Editortext auszuwählen</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Standard Textfont</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>Drücken, um den Font auszuwählen, der als Monospace Font verwendet wird</translation> + <source>Press to select the default font for the editor's text</source> + <translation>Drücken, um den Standardfont für den Editortext auszuwählen</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Monospace Font</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> - <source>Press to select the font for the editor line numbers</source> - <translation>Drücken, um den Font für die Zeilennummern des Editors zu wählen</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> - <source>Line Numbers Font</source> - <translation>Zeilennummernfont</translation> + <source>Default Text Font</source> + <translation>Standard Textfont</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>Drücken, um den Font auszuwählen, der als Monospace Font verwendet wird</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Monospace Font</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> + <source>Press to select the font for the editor line numbers</source> + <translation>Drücken, um den Font für die Zeilennummern des Editors zu wählen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> + <source>Line Numbers Font</source> + <translation>Zeilennummernfont</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Monospace Text</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Ränder</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Wähle aus, ob die Zeilennummernspalte angezeigt werden soll.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Zeige Zeilennummernspalte</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Wähle aus, ob die Faltungsspalte angezeigt werden soll.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Wähle aus, ob die Zeilennummernspalte angezeigt werden soll.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Zeige Zeilennummernspalte</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Wähle aus, ob die Faltungsspalte angezeigt werden soll.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Zeige Faltungsspalte</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Zeilennummernbreite:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Zeilennummernbreite:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Verschiebe den Regler zur Wahl der Breite der Zeilennummernspalte.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Zeigt die ausgewählte Breite der Zeilennummernspalte an.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Faltungsstil:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Wähle den Faltungsstil aus, der in der Faltungsspalte verwendet werden soll</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9112,405 +9113,410 @@ <translation><b>Faltungsstil</b><p>Wähle den Faltungsstil aus, der in der Faltungsspalte verwendet werden soll.</p><p>Die verfügbaren Stile sind:<ul><li>Einfach - einfache Plus- und Minus-Zeichen</li><li>Kreis - eingekreiste Plus- und Minus-Zeichen</li><li>Kasten - eingerahmte Plus- und Minus-Zeichen</li><li>Baum mit Kreisen - Baumdarstellung mit abgerundeten Ecken und eingekreisten Plus- und Minus-Zeichen</li><li>Baum mit Kästen - Baumdarstellung mit rechtwinkligen Ecken und eingerahmten Plus- und Minus-Zeichen</li></ul></p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Einfach</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Kreis</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Kasten</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Baum mit Kreisen</translation> + <source>Circled</source> + <translation>Kreis</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Kasten</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Baum mit Kreisen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Baum mit Kästen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Auswahl</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Auswählen, um eigen Farben für die Auswahl zu verwenden</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>Eigene Farben für Auswahl</b><p>Diesen Eintrag auswählen, um eigene Farben für die Auswahl in Editor und Shell Fenstern zu verwenden. Die Farben für den Auswahlvorder- und -hintergrund werden auf der Farbkonfigurationsseite eingestellt.</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Eigene Farben für Auswahl</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>Auswählen, um den ausgewählten Text durch den Lexer einzufärben.</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>Eigene Farben für Auswahl</b><p>Diesen Eintrag auswählen, um eigene Farben für die Auswahl in Editor und Shell Fenstern zu verwenden. Die Farben für den Auswahlvorder- und -hintergrund werden auf der Farbkonfigurationsseite eingestellt.</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Ausgewählten Text einfärben</translation> + <source>Use custom selection colours</source> + <translation>Eigene Farben für Auswahl</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>Auswählen, um die Auswahl bis zum Zeilenende zu erweitern</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>Auswählen, um den ausgewählten Text durch den Lexer einzufärben.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Ausgewählten Text einfärben</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>Auswählen, um die Auswahl bis zum Zeilenende zu erweitern</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Auswahl bis zum Zeilenende erweitern</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Vordergrund der Auswahl:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Wählt die Textfarbe für die Auswahl.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Wählt die Textfarbe für die Auswahl.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Hintergrund der Auswahl:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Wähle die Hintergrundfarbe für die Auswahl.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Cursor</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Auswählen, um die aktuelle Zeile hervorzuheben</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Aktuelle Zeile hervorheben</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Cursorbreite:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Wähle die Cursorbreite (1, 2 oder 3 Pixel)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Cursorfarbe:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Wähle die Farbe für die Einfügemarke.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Wähle die Farbe für die Einfügemarke.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Hintergrund der aktuellen Zeile:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Wähle die Hintergrundfarbe für die Zeile mit der Einfügemarke.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Markierung für aktuelle Zeile:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Wähle die Farbe der Markierung für die aktuelle Zeile.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Wähle die Farbe der Markierung für die aktuelle Zeile.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Markierung für Fehlerzeile:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Klammern</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Wähle aus, ob passende und ungültige Klammerung hervorgehoben werden soll.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Klammerung hervorheben</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Wähle aus, ob passende und ungültige Klammerung hervorgehoben werden soll.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Klammerung hervorheben</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Passende Klammer:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Wähle die Farbe zur Hervorhebung passender Klammerung.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Wähle die Farbe zur Hervorhebung passender Klammerung.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Hintergrund passende Klammer:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Wähle die Hintergrundfarbe zur Hervorhebung passender Klammerung.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Ungültige Klammer:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Wähle die Farbe zur Hervorhebung ungültiger Klammerung.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Hintergrund ungültige Klammer:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Wähle die Hintergrundfarbe zur Hervorhebung ungültiger Klammerung.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Zeilenende</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Wähle aus, ob die Zeilenendemarkierung angezeigt werden soll</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Zeige Zeilenendemarkierung</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Auswählen, wenn lange Zeilen umbrochen werden sollen</translation> + <source>Select whether end of line shall be shown</source> + <translation>Wähle aus, ob die Zeilenendemarkierung angezeigt werden soll</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Zeige Zeilenendemarkierung</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Auswählen, wenn lange Zeilen umbrochen werden sollen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Lange Zeilen umbrechen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Seitenrand</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Wähle die Farbe für den Seitenrand.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Wähle die Farbe für den Seitenrand.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Hintergrundfarbe:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Bewegen sie den Schieber, um die Seitenbreite zu setzen.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Zeigt die gewählte Tabulatorweite an.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Seitenbreite:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Modus:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Ausgeschaltet</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Zeichne Linie</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Ausgeschaltet</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Zeichne Linie</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Ändere Hintergrundfarbe</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Verschiedenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Wähle aus, ob Leerzeichen angezeigt werden sollen</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Zeige Leerzeichen</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Auswählen, um ein minimales Kontextmenü anzuzeigen</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Wähle aus, ob Leerzeichen angezeigt werden sollen</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Zeige Leerzeichen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Auswählen, um ein minimales Kontextmenü anzuzeigen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Zeige minimales Kontextmenü</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Spaltenvordergrund:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Wähle die Vordergrundfarbe der Spalten</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Wähle die Vordergrundfarbe der Spalten</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Spaltenhintergrund:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Wähle die Hintergrundfarbe der Spalten</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Wähle die Hintergrundfarbe der Spalten</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Hintergrund der Faltungsspalte:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Wähle die Hintergrundfarbe der Faltungsspalte</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Auswählen, um zusammengefaßte Spalten anzuzeigen (wie eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Zeige zusammengefaßte Spalten</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Zeilenmarkierungen zum Debuggen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation>Vergrößerung</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation>Anfangsvergrößerungsfaktor:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation>Anfangsvergrößerungsfaktor:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation>Verschiebe den Regler zur Auswahl des Anfangsvergrößerungsfaktors</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation>Zeigt den gewählten Anfangsvergrößerungsfaktor an</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation>Pfeile</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation>Baum mit Pfeilen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation>Faltmarkenvordergrund:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation>Wähle die Vordergrundfarbe der Faltmarken</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation>Wähle die Vordergrundfarbe der Faltmarken</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation>Faltmarkenhintergrund:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation>Wähle die Hintergrundfarbe der Faltmarken</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation><b>Hinweis:</b>Schriftarten und Farben der Syntax Hervorhebungen müssen auf der Seite "Syntax-Hervorhebung, Stile" konfiguriert werden.</translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11106,7 +11112,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Wähle ein Verzeichnis</translation> </message> @@ -11241,12 +11247,12 @@ <translation>Text</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Anhalten</translation> </message> @@ -11301,19 +11307,19 @@ <translation>Ersetzen</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Ersetzen in Dateien</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> - <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><P>Ursache: {1}</p></translation> - </message> - <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> + </message> + <message> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> - <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><P>Ursache: {1}</p></translation> + <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> <location filename="UI/FindFileDialog.ui" line="308"/> @@ -11336,25 +11342,30 @@ <translation>Ersttreffer öffnen</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation>Ungültiger Suchausdruck</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Der Suchausdruck ist nicht gültig.</p><p>Fehler: {0}</p></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation><p>Der aktuelle und der originale Hash-Wert der Datei <b>{0}</b> sind unterschiedlich. Überspringe sie.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -11716,7 +11727,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="774"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -39767,7 +39778,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Sie können %-Codes als Platzhalter in der Eingabe verwenden. Unterstützte Codes sind:<table><tr><td>%C</td><td>Spalte des Cursor des aktuellen Editors</td></tr><tr><td>%D</td><td>Verzeichnis des aktuellen Editors</td></tr><tr><td>%F</td><td>Dateiname des aktuellen Editors</td></tr><tr><td>%H</td><td>Home-Verzeichnis des aktullen Nutzers</td></tr><tr><td>%L</td><td>Zeile des Cursor des aktuellen Editors</td></tr><tr><td>%P</td><td>Pfad des aktuellen Projektes</td></tr><tr><td>%S</td><td>selektierter Text des aktuellen Editors</td></tr><tr><td>%U</td><td>Nutzername des aktuellen Nutzers</td></tr><tr><td>%%</td><td>das Prozentzeichen</td></tr></table></p></translation> </message>
--- a/i18n/eric5_en.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_en.ts Sat Oct 16 20:28:00 2010 +0200 @@ -8919,112 +8919,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> + <source>Press to select the default font for the editor's text</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> + <source>Default Text Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> + <source>Select whether line numbers margin should be shown.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> - <source>Show Fold Margin</source> + <source>Show Line Numbers Margin</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> - <source>Select to show unified margins (like eric4 < 4.3.0)</source> + <source>Select whether the fold margin should be shown.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <source>Show Fold Margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> + <source>Select to show unified margins (like eric4 < 4.3.0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9039,410 +9039,415 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> + <source>Circled</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> - <source>Boxed Tree</source> + <source>Boxed</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> - <source>Arrow</source> + <source>Circled Tree</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <source>Boxed Tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> + <source>Arrow</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> - <source>Select the background colour for the foldmargin</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <source>Select the background colour for the foldmargin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> <source>Press to select the font for the editor line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> <source>Line Numbers Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> + <source>Use custom selection colours</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> + <source>Select, if selected text should be colourized by the lexer.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> + <source>Select whether end of line shall be shown</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> + <source>Select whether whitspace characters shall be shown</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11228,55 +11233,60 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -39394,7 +39404,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_es.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9112,117 +9112,117 @@ <translation><b>Configurar estilos del editor</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Fuentes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Seleccionar si la fuente monoespacio se debe usar por defecto</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Usar monoespacio por defecto</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Usar monoespacio por defecto</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Texto por Defecto</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>Pulse para seleccionar la fuente por defecto del editor de texto</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Fuente de texto por defecto</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>Pulse para seleccionar la fuente para utilizar como fuente monoespacio</translation> + <source>Press to select the default font for the editor's text</source> + <translation>Pulse para seleccionar la fuente por defecto del editor de texto</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Fuente Monoespacio</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> - <source>Press to select the font for the editor line numbers</source> - <translation>Pulse para seleccionar la fuente para números de línea en el editor</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> - <source>Line Numbers Font</source> - <translation>Fuente para números de Línea</translation> + <source>Default Text Font</source> + <translation>Fuente de texto por defecto</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>Pulse para seleccionar la fuente para utilizar como fuente monoespacio</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Fuente Monoespacio</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> + <source>Press to select the font for the editor line numbers</source> + <translation>Pulse para seleccionar la fuente para números de línea en el editor</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> + <source>Line Numbers Font</source> + <translation>Fuente para números de Línea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Texto Monoespaciado</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Márgenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Seleccionar si el margen para números de línea debe ser mostrado.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Mostrar margen para números de Línea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Seleccionar si el margen de plegado debe ser mostrado.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Seleccionar si el margen para números de línea debe ser mostrado.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Mostrar margen para números de Línea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Seleccionar si el margen de plegado debe ser mostrado.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Mostrar margen de plegado</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Ancho de números de línea:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Ancho de números de línea:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Mover para establecer la anchura del margen para números de línea.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Muestra la anchura seleccionada para el margen de números de línea.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Estilo de plegado:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Seleccionar el estilo de plegado a utilizar en el margen de plegado</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9247,405 +9247,410 @@ </p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Plano</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Con círculo</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Con Caja</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Árbol con Círculo</translation> + <source>Circled</source> + <translation>Con círculo</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Con Caja</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Árbol con Círculo</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Árbol con Caja</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Selección</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Seleccione para usar colores personalizados para la selección</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>Usar colores personalizados para la selección</b><p>Seleccione esta entrada para utilizar colores personalizados de selección en las ventanas de edición y shell. Los colores para el primer plano y para el fondo se definen en la página de colores</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Usar colores personalizados para la selección</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>Seleccione si el texto seleccionado debe ser coloreado por el analizador léxico.</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>Usar colores personalizados para la selección</b><p>Seleccione esta entrada para utilizar colores personalizados de selección en las ventanas de edición y shell. Los colores para el primer plano y para el fondo se definen en la página de colores</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Colorizar texto seleccionado</translation> + <source>Use custom selection colours</source> + <translation>Usar colores personalizados para la selección</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>Seleccionar para extender la selección hasta el final de la línea</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>Seleccione si el texto seleccionado debe ser coloreado por el analizador léxico.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Colorizar texto seleccionado</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>Seleccionar para extender la selección hasta el final de la línea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Extender selección hasta el final de la línea</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Primer plano de la selección:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Seleccionar el color de primer plano para la selección.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Seleccionar el color de primer plano para la selección.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Color de fondo de la selección:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Seleccione el color de fondo para la selección.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Punto de inserción de texto</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Seleccionar si la línea con el punto de inserción de texto debe ser resaltada</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Punto de inserción de texto visible</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Anchura del punto de inserción de texto:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Seleccionar ancho del punto de inserción de texto (1, 2 o 3 píxeles)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Color de primer plano para el punto de inserción de texto:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Seleccionar el color para el punto de inserción de texto.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Seleccionar el color para el punto de inserción de texto.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Color de fondo para la línea con el punto de inserción de texto:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Seleccionar el color de fondo para la línea que contiene el punto de inserción de texto.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Marcador de línea actual:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Seleccionar el color para el marcador de línea actual.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Seleccionar el color para el marcador de línea actual.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Marcador de línea con error:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Seleccionar el color para el marcador de línea con error.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Llaves ( '{' y '}' )</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Seleccionar si las llaves coincidentes y las que no se han de resaltar.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Resaltar llaves</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Seleccionar si las llaves coincidentes y las que no se han de resaltar.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Resaltar llaves</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Llaves coincidentes:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Seleccione el color de resaltado de llaves coincidentes.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Seleccione el color de resaltado de llaves coincidentes.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Fondo de llaves coincidentes:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Seleccione el color de fondo para resaltar llaves coincidentes.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Llave sin coincidencia:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Seleccione el color de resaltado de llaves sin coincidencia.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Fondo de llaves sin coincidencia:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Seleccione el color de fondo para resaltar llaves sin coincidencia.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Final de Línea</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Seleccionar si el final de línea debe ser mostrado</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Mostrar final de línea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Seleccionar si las líneas largas se deben partir</translation> + <source>Select whether end of line shall be shown</source> + <translation>Seleccionar si el final de línea debe ser mostrado</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Mostrar final de línea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Seleccionar si las líneas largas se deben partir</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Partir líneas largas</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Modo del Borde</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Seleccionar el color para el marcador del borde.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Seleccionar el color para el marcador del borde.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Color de fondo:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Mover para establecer la columna del borde.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Muestra el ancho de tabulación seleccionado.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Número de columnas:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Modo:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Deshabilitado</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Dibujar línea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Deshabilitado</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Dibujar línea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Cambiar color de fondo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Varios</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Seleccionar si los caracteres de espacio en blanco deben ser mostrados</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Mostrar espacios en blanco</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Seleccionar mostrar un menú de contexto minimalista</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Seleccionar si los caracteres de espacio en blanco deben ser mostrados</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Mostrar espacios en blanco</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Seleccionar mostrar un menú de contexto minimalista</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Mostrar menú de contexto minimalista</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Color de primer plano para márgenes:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Seleccionar el color de primer plano para los márgenes</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Seleccionar el color de primer plano para los márgenes</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Color de fondo para los márgenes:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Seleccione el color de fondo para los márgenes</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Seleccione el color de fondo para los márgenes</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Color de fondo para los pliegues de los márgenes:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Seleccione el color de fondo para los pliegues de los márgenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Seleccionar para mostrar márgenes unificados (como eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Mostrar márgenes unificados</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Marcadores de Línea de Depuración</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation>Zoom</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation>Factor de zoom inicial:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation>Factor de zoom inicial:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation>Mover para establecer el factor de zoom inicial</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation>Muestra el factor de zoom inicial seleccionado</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation>Flecha</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation>Árbol de flechas</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation>Color de primer plano para marcadores de plegado:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation>Seleccionar el color de primer plano para los marcadores de plegado</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation>Seleccionar el color de primer plano para los marcadores de plegado</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation>Color de fondo para marcadores de plegado:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation>Seleccionar el color de fondo para los marcadores de plegado</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11369,17 +11374,17 @@ <translation>Texto</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Seleccionar un directorio</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Detener</translation> </message> @@ -11444,7 +11449,7 @@ <translation>Reemplazar</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Reemplazar en Archivos</translation> </message> @@ -11459,35 +11464,40 @@ <translation>Abrir primera ocurrencia</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation>Expresión de búsqueda no válida</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>La expresión de búsqueda no es válida.</p><p>Error:{0}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo leer el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -40218,7 +40228,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation> </message>
--- a/i18n/eric5_fr.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_fr.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9859,118 +9859,118 @@ <translation><b>Configuration des styles</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Polices</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Cocher pour utiliser une police monospacée par défaut</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Police monospacée par défaut</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Police monospacée par défaut</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Texte par défaut</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>Cliquer pour sélectionner la police par défaut de l'éditeur de texte</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Police par défaut</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>Cliquer pour choisir une police monospacée -(les caractères auront tous la même largeur)</translation> + <source>Press to select the default font for the editor's text</source> + <translation>Cliquer pour sélectionner la police par défaut de l'éditeur de texte</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Police monospacée</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> - <source>Press to select the font for the editor line numbers</source> - <translation>Cliquer pour choisir une police pour les numéros de ligne</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> - <source>Line Numbers Font</source> - <translation>Police des numéros de ligne</translation> + <source>Default Text Font</source> + <translation>Police par défaut</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>Cliquer pour choisir une police monospacée +(les caractères auront tous la même largeur)</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Police monospacée</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> + <source>Press to select the font for the editor line numbers</source> + <translation>Cliquer pour choisir une police pour les numéros de ligne</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> + <source>Line Numbers Font</source> + <translation>Police des numéros de ligne</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Texte monospacé</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Marges</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Indique si la colonne donnant les numéros de ligne doit être affichée.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Afficher les numéros de ligne</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Sélectionne si la marge de pliage de code doit être affichée.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Indique si la colonne donnant les numéros de ligne doit être affichée.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Afficher les numéros de ligne</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Sélectionne si la marge de pliage de code doit être affichée.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Afficher la marge de contraction de code</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Largeur de marge pour les numéros de ligne:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Largeur de marge pour les numéros de ligne:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Déplacer le curseur pour changer la largeur de marge des numéros de ligne.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Affiche la largeur sélectionnée pour la colonne donnant les numéros de ligne.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Type de pliage de code:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Sélectionner un style pour le pliage de code</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9995,405 +9995,410 @@ </p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Brut</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Cerclé</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Carré</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Cerclé, Arborecent</translation> + <source>Circled</source> + <translation>Cerclé</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Carré</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Cerclé, Arborecent</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Carré, Arborescent</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Sélection</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Cocher pour utiliser des couleurs de sélection personalisées</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>Utiliser des couleurs personalisées pour la sélection</b><p>Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l'éditeur et dans la fenêtre shell. Les couleurs de police et d'arrière plan pour la sélection sont définies dans la section Couleur.</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Utiliser des couleurs personlisées pour la sélection de texte</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>Cocher si le texte sélectionné doit etre colorié par l'analyseur syntaxique.</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>Utiliser des couleurs personalisées pour la sélection</b><p>Cocher cette case pour utiliser des couleurs personalisées pour la sélection de texte dans l'éditeur et dans la fenêtre shell. Les couleurs de police et d'arrière plan pour la sélection sont définies dans la section Couleur.</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Colorier le texte sélectionné</translation> + <source>Use custom selection colours</source> + <translation>Utiliser des couleurs personlisées pour la sélection de texte</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>Cocher pour étendre la sélection à la fin de la ligne</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>Cocher si le texte sélectionné doit etre colorié par l'analyseur syntaxique.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Colorier le texte sélectionné</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>Cocher pour étendre la sélection à la fin de la ligne</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Extension de la sélection à la fin de la ligne</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Couleur des caractères:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Couleur des caractères pour la sélection.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Couleur des caractères pour la sélection.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Couleur de fond:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Sélectionne la couleur de fond pour les caractères sélectionnés.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Curseur</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Cocher, si la ligne du curseur doit être colorée de façon spécifique</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Ligne du curseur visible</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Largeur du curseur:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Sélectionner une largeur de curseur (1, 2 or 3 pixels)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Curseur:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Couleur pour le curseur.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Couleur pour le curseur.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Ligne du curseur:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Sélection de la couleur de fond pour la ligne contenant le curseur.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Ligne courante (debug):</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Sélectionne la couleur de la ligne courante quand elle est marquée automatiquement.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Sélectionne la couleur de la ligne courante quand elle est marquée automatiquement.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Ligne d'erreur:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Sélectionne la couleur pour les lignes ayant une erreur.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Parenthèses</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Indique si bonnes et mauvaises parenthèses doivent être colorées.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Coloration des parenthèses</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Indique si bonnes et mauvaises parenthèses doivent être colorées.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Coloration des parenthèses</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Fermeture valide des parenthèses:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Sélectionne la couleur des parenthèses correctement fermées.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Sélectionne la couleur des parenthèses correctement fermées.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Couleur de fond:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Sélectionner une couleur de fond pour surligner le texte des parenthèses correctement refermées.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Parenthèse non refermée:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Sélectionne la couleur des parenthèses mal fermées.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Couleur de fond:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Sélectionner une couleur de fond pour surligner le texte des parenthèses non refermées.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Fins de lignes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Indique si les caractères "fin de ligne" (EOL) doivent être affichés</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Afficher les caractères de fin de ligne (EOL)</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Sélectionner pour passer automatiquement à la ligne lors de l'affichage des longues lignes</translation> + <source>Select whether end of line shall be shown</source> + <translation>Indique si les caractères "fin de ligne" (EOL) doivent être affichés</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Afficher les caractères de fin de ligne (EOL)</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Sélectionner pour passer automatiquement à la ligne lors de l'affichage des longues lignes</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Retour à la ligne automatique</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Bordure de fin de ligne</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Sélectionner la couleur de la bordure.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Sélectionner la couleur de la bordure.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Couleur de fond:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Déplacer pour choisir la colonne de bordure.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Affiche la largeur des tabulations.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Numéro de colonne:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Mode:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Désactivé</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Ligne verticale</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Désactivé</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Ligne verticale</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Changement de la couleur de fond</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Divers</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Sélectionne si les espaces doivent être affichés explicitement</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Affiche explicitement les espaces</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Cocher pour utiliser un menu contextuel réduit</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Sélectionne si les espaces doivent être affichés explicitement</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Affiche explicitement les espaces</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Cocher pour utiliser un menu contextuel réduit</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Afficher un menu contextuel minimal</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Couleur des numéros de ligne</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Sélection de la couleur des numéros de ligne dans la marge</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Sélection de la couleur des numéros de ligne dans la marge</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Couleur de fond des marges :</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Sélection de la couleur de fond pour les marges</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Sélection de la couleur de fond pour les marges</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Couleur de la marge de pliage de code : </translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Sélectionne la couleur de la marge de pliage de code</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Cocher pour afficher des marges unfifiées (comme dans eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Afficher des marges unifiées</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Marquage des lignes déboguées</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation type="unfinished">Zoom</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -12158,7 +12163,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Sélection répertoire</translation> </message> @@ -12293,12 +12298,12 @@ <translation>Texte</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Trouver</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Arrêt</translation> </message> @@ -12363,7 +12368,7 @@ <translation>Remplacer</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Remplacer dans les fichiers</translation> </message> @@ -12388,35 +12393,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation type="unfinished">Ouvrir</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -44031,7 +44041,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation> </message>
--- a/i18n/eric5_it.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_it.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9110,117 +9110,117 @@ <translation><b>Configura stili dell'editor</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Fonts</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Seleziona, nel caso il font prespaziato debba essere usato come default</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Usa font prespaziato come default</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Usa font prespaziato come default</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Testo di default</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>Premi per selezionare il font di default per il testo dell'editor</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Font di default del testo</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>Premi per selezionare un font da usare a larghezza fissa</translation> + <source>Press to select the default font for the editor's text</source> + <translation>Premi per selezionare il font di default per il testo dell'editor</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Font a larghezza fissa</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> - <source>Press to select the font for the editor line numbers</source> - <translation>Premi per selezionare il font per i numeri di linea dell'editor</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> - <source>Line Numbers Font</source> - <translation>Font Numeri linea</translation> + <source>Default Text Font</source> + <translation>Font di default del testo</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>Premi per selezionare un font da usare a larghezza fissa</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Font a larghezza fissa</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> + <source>Press to select the font for the editor line numbers</source> + <translation>Premi per selezionare il font per i numeri di linea dell'editor</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> + <source>Line Numbers Font</source> + <translation>Font Numeri linea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Testo prespaziato</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Margini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Seleziona nel caso il margine per i numeri di linea debba essere mostrato.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Mostra il margine per i numeri di linea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Seleziona se il margine per la compressione deve essere mostrato.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Seleziona nel caso il margine per i numeri di linea debba essere mostrato.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Mostra il margine per i numeri di linea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Seleziona se il margine per la compressione deve essere mostrato.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Mostra margine di compressione</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Larghezza numeri di riga:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Larghezza numeri di riga:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Muovi per impostare la larghezza del margine per il numero di linea.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Mostra la larghezza del margine per il numero di linea impostato.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Stile compressione:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Selezione lo stile di compressione da usare nel margine</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9245,405 +9245,410 @@ </p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Semplice</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Cerchiato</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Squadrato</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Albero cerchiato</translation> + <source>Circled</source> + <translation>Cerchiato</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Squadrato</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Albero cerchiato</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Albero squadrato</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Selezione</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Selezione per usare colori personalizzati per la selezione</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>Usa colori personalizzati per la selezione</b><p>Seleziona per poter usare colori personalizzati per la selezione nella finestra dell'editor e nella shell. I colori per la selezione del primo piano e dello sfondo sono definiti sulla pagina dei colori.</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Usa colori personalizzati per le selezione</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>Seleziona, se il testo selezionato deve essere colorato dall'analizzatore lessicale.</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>Usa colori personalizzati per la selezione</b><p>Seleziona per poter usare colori personalizzati per la selezione nella finestra dell'editor e nella shell. I colori per la selezione del primo piano e dello sfondo sono definiti sulla pagina dei colori.</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Colora testo selezionato</translation> + <source>Use custom selection colours</source> + <translation>Usa colori personalizzati per le selezione</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>Seleziona per estendere la selezione fino alla fine della linea</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>Seleziona, se il testo selezionato deve essere colorato dall'analizzatore lessicale.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Colora testo selezionato</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>Seleziona per estendere la selezione fino alla fine della linea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Estendi selezione fino alla fine della linea</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Selezione primo piano:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Seleziona il colore di primo piano per la selezione.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Seleziona il colore di primo piano per la selezione.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Selezione sfondo:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Seleziona il colore di sfondo per la selezione.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Caret</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Seleziona, se il caret deve essere evidenziato</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Caretline visibile</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Larghezza Caret:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Selezione larghezza caret (1, 2 o 3 pixel)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Primo piano Caret:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Seleziona il colore per il caret.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Seleziona il colore per il caret.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Sfondo caretline:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Seleziona il colore di sfondo per una linea contenente il caret.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Marcatore di linea corrente:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Seleziona il colore per il marcatore di linea corrente.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Seleziona il colore per il marcatore di linea corrente.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Marcatori linea errore:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Seleziona il colore per il marcatore di linea di errore.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Parentesi</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Seleziona nel caso parentesi bilanciate e non bialnciate debbano essere evidenziate.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Evidenzia parentesi</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Seleziona nel caso parentesi bilanciate e non bialnciate debbano essere evidenziate.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Evidenzia parentesi</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Parentesi bilanciate:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Seleziona il colore di evidenziazione delle parentesi bilanciate.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Seleziona il colore di evidenziazione delle parentesi bilanciate.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Sfondo parentesi bilanciate:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Seleziona il colore di sfondo per evidenziare le parentesi bilanciate.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Parentesi non bilanciate::</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Seleziona il colore per evidenziare parentesi non bilanciate.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Sfondo parentesi non bilanciate:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Seleziona il colore di sfondo per l'evidenziazione delle parentesi non bilanciate.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Fine linea</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Selezione nel caso il fine linea debba essere mostrato</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Mostra fine linea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Seleziona, nel caso le linee lunghe debbano essere impaginate</translation> + <source>Select whether end of line shall be shown</source> + <translation>Selezione nel caso il fine linea debba essere mostrato</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Mostra fine linea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Seleziona, nel caso le linee lunghe debbano essere impaginate</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Dividi linee lunghe</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Modo Edge</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Seleziona il colore per il marcatore del bordo.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Seleziona il colore per il marcatore del bordo.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Colore di sfondo:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Muovi per impostare la colonna del bordo.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Mostra la larghezza attuare del tab.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Numero colonna:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Modo:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Disabilitato</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Disegna linea</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Disabilitato</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Disegna linea</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Cambia colore di sfondo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Vari</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Seleziona nel caso gli spaci devono essere mostrati</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Mostra spazi</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Seleziona per mostrare un menù di contesto minimale</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Seleziona nel caso gli spaci devono essere mostrati</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Mostra spazi</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Seleziona per mostrare un menù di contesto minimale</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Mostra menù di contesto minimale</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Primo piano per i margini:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Seleziona il colore di primo piano per i margini</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Seleziona il colore di primo piano per i margini</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Sfondo margini:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Seleziona il colore di sfondo per i margini</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Seleziona il colore di sfondo per i margini</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Sfondo margine di compressione:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Seleziona il colore di sfondo per il margine di compressione</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Selezione per mostrare i margini unificati (come eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Mostra margini unificati</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Marcatori linea di debug</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation>Zoom</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation>Fattore di zoom iniziale:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation>Fattore di zoom iniziale:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation>Muovi per impostare il fattore iniziale dello zoom</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation>Mostra il fattore di zoom iniziale selezionato</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11249,7 +11254,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Seleziona una directory</translation> </message> @@ -11384,12 +11389,12 @@ <translation>Testo</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Trova</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Ferma</translation> </message> @@ -11454,7 +11459,7 @@ <translation>Sostituisci</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Sostituisci nei file</translation> </message> @@ -11469,35 +11474,40 @@ <translation>Feeling Like</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation>Copia il path nella Clipboard</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation>Espressione di ricerca non valida</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>L'espressione di ricerca non è valida.</p><p>Errore: {0}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso leggere il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -40255,7 +40265,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puoi usare i codici % come segnaposti nella stringa. I codici supportati sono: <table><tr><td>%C</td><td>colonna del cursore nell'editor attuale</td></tr><tr><td>%D</td><td>directory dell'editor attuale</td></tr><tr><td>%F</td><td>nome file dell'editor corrente</td></tr><tr><td>%H</td><td>directory home dell'utente attuale</td></tr><tr><td>%L</td><td>linea del cursore dell'editor attuale</td></tr><tr><td>%P</td><td>percorso del progetto attuale</td></tr><tr><td>%S</td><td>testo selezionato dell'editor attuale</td></tr><tr><td>%U</td><td>username dell'utente attuale</td></tr><tr><td>%%</td><td>Segno percentuale</td></tr></table></p></translation> </message>
--- a/i18n/eric5_ru.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_ru.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9126,147 +9126,147 @@ <context> <name>EditorStylesPage</name> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>Стиль сворачивания:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>Какой стиль сворачивания будет использован</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> - <source>Plain</source> - <translation>Обычный</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>Окружности</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Квадраты</translation> + <source>Plain</source> + <translation>Обычный</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>Дерево с окружностями</translation> + <source>Circled</source> + <translation>Окружности</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Квадраты</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>Дерево с окружностями</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Дерево с квадратами</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>Следует ли использовать по умолчанию моноширинный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> <source>Use monospaced as default</source> <translation>Использовать моноширинный шрифт по умолчанию</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> <source>Press to select the font to be used as the monospaced font</source> <translation>Задайте шрифт, который будет использован как моноширинный</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> <source>Monospaced Font</source> <translation>Моноширинный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> <source>Press to select the font for the editor line numbers</source> <translation>Нажмите для выбора шрифта для номеров строк в редакторе</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> <source>Line Numbers Font</source> <translation>Шрифт для номеров строк</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>Будет ли подсвечиваться текущая строка</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Подсветка текущей строки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> <source>Select, if selected text should be colourized by the lexer.</source> <translation>Будет ли лексический анализатор подсвечивать выделенный текст другим цветом.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> <source>Colourize selected text</source> <translation>Изменять цвет выделенного текста</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Ширина каретки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Задайте ширину каретки (1, 2 или 3 пикселя)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Правая граница</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>Задайте цвет для отображения правой границы.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>Задайте цвет для отображения правой границы.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Цвет фона:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>Задайте положение правой границы.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Выбранная ширина табуляции.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Колонка:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Режим:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Отключено</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Рисовать линию</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Отключено</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Рисовать линию</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Изменить цвет фона</translation> </message> @@ -9276,113 +9276,113 @@ <translation><b>Настроить стили редактора</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Моноширинный текст</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> <source>Default Text Font</source> <translation>Шрифт по-умолчанию</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Обычный текст</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> <source>Press to select the default font for the editor's text</source> <translation>Задать шрифт по-умолчанию</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>Использовать собственные цвета выделения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> <translation><b>Собственные цвета выделения</b> <p>Выберите эту пометку, чтобы использовать собственные цвета для выделения в окнах редактора и оболочки. Цвета выделения устанавливаются на странице настройки цветов.</p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> <source>Use custom selection colours</source> <translation>Использовать собственные цвета для выделения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Шрифты</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Выделение</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> <source>Select to extend selection to end of line</source> <translation>Раздвинуть выделение до конца строки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Раздвинуть выделение до конца строки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Каретка</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Границы</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Будут ли показываться номера строк.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Показывать номера строк</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>Надо ли показывать полосу свёртки.</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Будут ли показываться номера строк.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> + <source>Show Line Numbers Margin</source> + <translation>Показывать номера строк</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <source>Select whether the fold margin should be shown.</source> + <translation>Надо ли показывать полосу свёртки.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> <source>Show Fold Margin</source> <translation>Показать полосу свёртки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Ширина номера строки:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Ширина номера строки:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Задайте ширину поля для номеров строк.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>Выбранная ширина края номеров линий.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9407,265 +9407,270 @@ </p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Цвет выделения:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>Задайте цвет выделения.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>Задайте цвет выделения.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Фон выделения:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>Задайте фон для выделенного текста.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Цвет каретки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Задайте цвет курсора.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Задайте цвет курсора.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Фон каретки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>Задайте фон для текущей строки.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Отметка текущей строки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>Выберите цвет для пометки текущей строки.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>Выберите цвет для пометки текущей строки.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Отметка ошибочной строки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>Выберите цвет для пометки ошибочной строки.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Фигурные скобки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>Будут ли подсвечиваться парные и неверно расставленные скобки.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Подсвечивать скобки</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>Будут ли подсвечиваться парные и неверно расставленные скобки.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Подсвечивать скобки</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>Парные скобки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>Выберите цвет для выделения парных скобок.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>Выберите цвет для выделения парных скобок.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>Цвет фона для закрытой скобки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Задайте цвет фона для подсветки закрытых скобок.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>Непарная скобка:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Выберите цвет для выделения непарных скобок.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>Цвет фона для незакрытой скобки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Задайте цвет фона для подсветки незакрытых скобок.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Конц строки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>Надо ли показывать концы строк</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Показать концы строк</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>Следует ли переносить длинные строки</translation> + <source>Select whether end of line shall be shown</source> + <translation>Надо ли показывать концы строк</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Показать концы строк</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>Следует ли переносить длинные строки</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>Переносить длинные строки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Разное</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>Будут ли показываться провельные символы</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Показывать пробелы</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>Показать минималистичное контекстное меню</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>Будут ли показываться провельные символы</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Показывать пробелы</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>Показать минималистичное контекстное меню</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Показать минималистичное контекстное меню</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Цвет границ:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>Цвет границ</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>Цвет границ</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Фоновый цвет границ:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>Фоновый цвет границ</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>Фоновый цвет границ</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>Фоновый цвет границ свертки:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>Фоновый цвет границ свертки</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> <source>Select to show unified margins (like eric4 < 4.3.0)</source> <translation>Показывать объединенные границы (как в eric4 < 4.3.0)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>Показывать объединенные границы</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>Отметка текущей строки отладчика</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation>Масштаб</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation>Начальный масштаб:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation>Начальный масштаб:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation>Установить начальный масштаб</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation>Показать начальный масштаб</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -11272,7 +11277,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -11407,12 +11412,12 @@ <translation>Текст</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Стоп</translation> </message> @@ -11467,17 +11472,17 @@ <translation>Заменить</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> @@ -11502,25 +11507,30 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation>Неверное выражение для поиска</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -40361,7 +40371,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>В строках вы можете использовать следующие %-коды:: <table>
--- a/i18n/eric5_tr.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_tr.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9797,112 +9797,112 @@ <translation><b>Düzenleyici Stilini Yapılandır</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>Yazı Tipleri</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>Tek hacimi varsayılan olarak kullan</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>Tek hacimi varsayılan olarak kullan</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>Öntanımlı Metin</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>Öntanımlı Metin Yazı Tipi</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> + <source>Press to select the default font for the editor's text</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>Tek Hacimli Yazıtipi</translation> + <source>Default Text Font</source> + <translation>Öntanımlı Metin Yazı Tipi</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>Tek Hacimli Yazıtipi</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>Tek Hacimli Metin</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>Sınırlar</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>Satır numaralarının gösterilip gösterilmeyeceğini seç.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>Satır Numanalarını Kenarda Göster</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation type="unfinished"></translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>Satır numaralarının gösterilip gösterilmeyeceğini seç.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> - <source>Show Fold Margin</source> - <translation type="unfinished"></translation> + <source>Show Line Numbers Margin</source> + <translation>Satır Numanalarını Kenarda Göster</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> - <source>Select to show unified margins (like eric4 < 4.3.0)</source> + <source>Select whether the fold margin should be shown.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <source>Show Fold Margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> + <source>Select to show unified margins (like eric4 < 4.3.0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>Satır Numarası ile:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>Satır Numarası ile:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>Kenardaki Satırnumarlarının genişliğini ayarlamak için taşı.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>kenarsatırnumaralarının seçilen genişliğini göster</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9917,410 +9917,415 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>Sade</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>Kutulu</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> + <source>Circled</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>Kutulu</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>Kutulu Ağaç</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>Önalan sınırları:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>Arkaalan sınırları:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> <source>Press to select the font for the editor line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> <source>Line Numbers Font</source> <translation>Satır Numaralarının Yazı Tipi</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>Seçim</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>Özel seçim renklerini kullan</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>Seçilen metni renklendir</translation> + <source>Use custom selection colours</source> + <translation>Özel seçim renklerini kullan</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> + <source>Select, if selected text should be colourized by the lexer.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>Seçilen metni renklendir</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>Seçimi satırın sonuna kadar aşağı genişlet</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>Seçim önalanı:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>Seçim arkaalanı:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>Düzeltme İmi</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>Düzeltme imi görünür</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>Düzeltme imi genişliği:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>Düzeltme imi önalan:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>Düzeltme imi için renk seçiniz.</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>Düzeltme imi için renk seçiniz.</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>Düzeltme imi çizgisi arkaalan:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>Geçerli satır işareti:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>Hatalı satır işaretleyicisi:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>Köşeli ayraçlar</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>Vurgulanmış Bölümler</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>Vurgulanmış Bölümler</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>Satırın Sonu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>Satır Sonunu Göster</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> + <source>Select whether end of line shall be shown</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>Satır Sonunu Göster</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>Köşe Modu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>Arkaalan rengi:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>Seçilen sekme genişliğini göster.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>Sütun numarası:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>Mod:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>Onaylanmamış</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>Çizgi Çizimi</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>Onaylanmamış</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>Çizgi Çizimi</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>Arkaalan Rengini Değiştir</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>Çeşitli</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>Boş Alanları Göster</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>En küçük içerik menüsünü göstermeyi seç</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>Boş Alanları Göster</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>En küçük içerik menüsünü göstermeyi seç</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>Enaz açılır menüyü göster</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation type="unfinished">Büyüt</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -12260,22 +12265,22 @@ <translation>Yerdeğiştir</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>Dur</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>Bul</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>Dosya içinde değiştir</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>Dizin Seçiniz</translation> </message> @@ -12300,35 +12305,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation type="unfinished">Aç</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -43128,7 +43138,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>%-alanlarda çeşitli kodları kullanabilirsiniz. Tanımlanan kodlar:<table><tr><td>%C</td><td>geçerli düzenleyicinin imlecinin sütunu</td></tr><tr><td>%D</td><td>geçerli düzenleyicinin dizini</td></tr><tr><td>%F</td><td>geçerli düzenleyicinin dosya adı</td></tr><tr><td>%H</td><td>geçerli kullancının ana dizini</td></tr><tr><td>%L</td><td>geçerli düzenleyicinin imlecinin satırı</td></tr><tr><td>%P</td><td>geçerli projenin yolu</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>Geçici kullanıcının kullanıcı adı</td></tr><tr><td>%%</td><td>oran işareti</td></tr></table></p></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Oct 16 19:18:43 2010 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Oct 16 20:28:00 2010 +0200 @@ -9817,112 +9817,112 @@ <translation><b>配置编辑器风格</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="47"/> <source>Fonts</source> <translation>字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="43"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="53"/> <source>Select, whether the monospaced font should be used as default</source> <translation>选择是否将等宽字体作为默认字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="46"/> - <source>Use monospaced as default</source> - <translation>默认使用等宽字体</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="56"/> + <source>Use monospaced as default</source> + <translation>默认使用等宽字体</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="66"/> <source>Default Text</source> <translation>默认文本 Default Text</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="69"/> - <source>Press to select the default font for the editor's text</source> - <translation>点击为编辑器文本选择默认字体</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="72"/> - <source>Default Text Font</source> - <translation>默认文本字体</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="79"/> - <source>Press to select the font to be used as the monospaced font</source> - <translation>点击选择被用作等宽字体的字体</translation> + <source>Press to select the default font for the editor's text</source> + <translation>点击为编辑器文本选择默认字体</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="82"/> - <source>Monospaced Font</source> - <translation>等宽字体</translation> + <source>Default Text Font</source> + <translation>默认文本字体</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="89"/> + <source>Press to select the font to be used as the monospaced font</source> + <translation>点击选择被用作等宽字体的字体</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="92"/> + <source>Monospaced Font</source> + <translation>等宽字体</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="102"/> <source>Monospaced Text</source> <translation>等宽文本 Monospaced Text</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="108"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="118"/> <source>Margins</source> <translation>页边空白</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="116"/> - <source>Select whether line numbers margin should be shown.</source> - <translation>选择是否显示行号。</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="119"/> - <source>Show Line Numbers Margin</source> - <translation>显示行号</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="126"/> - <source>Select whether the fold margin should be shown.</source> - <translation>选择是否显示折叠符号</translation> + <source>Select whether line numbers margin should be shown.</source> + <translation>选择是否显示行号。</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="129"/> - <source>Show Fold Margin</source> - <translation>显示折叠符号</translation> + <source>Show Line Numbers Margin</source> + <translation>显示行号</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="136"/> - <source>Select to show unified margins (like eric4 < 4.3.0)</source> - <translation>选择显示统一的页边空白(与 eric4 低于 4.3.0 的版本相同)</translation> + <source>Select whether the fold margin should be shown.</source> + <translation>选择是否显示折叠符号</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="139"/> + <source>Show Fold Margin</source> + <translation>显示折叠符号</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="146"/> + <source>Select to show unified margins (like eric4 < 4.3.0)</source> + <translation>选择显示统一的页边空白(与 eric4 低于 4.3.0 的版本相同)</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="149"/> <source>Show unified margins</source> <translation>显示统一页边空白</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="150"/> - <source>Linenumbers width:</source> - <translation>行号宽度:</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="160"/> + <source>Linenumbers width:</source> + <translation>行号宽度:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="170"/> <source>Move to set the width of the linenumbers margin.</source> <translation>移动可设定行号区域的宽度。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="182"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="192"/> <source>Displays the selected width of the linenumbers margin.</source> <translation>显示已选择的行号区域宽度。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="202"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="212"/> <source>Folding style:</source> <translation>折叠风格:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="215"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="225"/> <source>Select the folding style to be used in the folding margin</source> <translation>选择在折叠符号区域中使用的折叠符风格</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="218"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="228"/> <source><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: @@ -9947,410 +9947,415 @@ </p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="232"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> <source>Plain</source> <translation>简单</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="237"/> - <source>Circled</source> - <translation>圆形</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="242"/> - <source>Boxed</source> - <translation>方形</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="247"/> - <source>Circled Tree</source> - <translation>圆形树</translation> + <source>Circled</source> + <translation>圆形</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="252"/> + <source>Boxed</source> + <translation>方形</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <source>Circled Tree</source> + <translation>圆形树</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> <source>Boxed Tree</source> <translation>方形树</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="274"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="284"/> <source>Margins foreground:</source> <translation>页边空白前景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="287"/> - <source>Select the foreground colour for the margins</source> - <translation>为页边空白选择前景色</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="297"/> + <source>Select the foreground colour for the margins</source> + <translation>为页边空白选择前景色</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="307"/> <source>Margins background:</source> <translation>页边空白背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="310"/> - <source>Select the background colour for the margins</source> - <translation>为页边空白选择背景色</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="320"/> + <source>Select the background colour for the margins</source> + <translation>为页边空白选择背景色</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="330"/> <source>Foldmargin background:</source> <translation>折叠符区域背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="333"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> <source>Select the background colour for the foldmargin</source> <translation>为折叠符区域选择背景色</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="393"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="403"/> <source>Press to select the font for the editor line numbers</source> <translation>点击为编辑器行号选择字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="396"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="406"/> <source>Line Numbers Font</source> <translation>行号字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="412"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="422"/> <source>2345</source> <translation>2345</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="443"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="453"/> <source>Selection</source> <translation>选区</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="451"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="461"/> <source>Select to use custom selection colours</source> <translation>选择可使用自定义选区颜色</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="454"/> - <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> - <translation><b>使用自定义选区颜色</b><p>选择该条目可在编辑器和命令行窗口中使用自定义选区颜色。选区的前景色和背景色在颜色页面中定义。</p></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="457"/> - <source>Use custom selection colours</source> - <translation>使用自定义选区颜色</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="464"/> - <source>Select, if selected text should be colourized by the lexer.</source> - <translation>选择所选文本是否由词法分析器着色</translation> + <source><b>Use custom selection colours</b><p>Select this entry in order to use custom selection colours in the editor and shell windows. The colours for the selection foreground and background are defined on the colours page.</p></source> + <translation><b>使用自定义选区颜色</b><p>选择该条目可在编辑器和命令行窗口中使用自定义选区颜色。选区的前景色和背景色在颜色页面中定义。</p></translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="467"/> - <source>Colourize selected text</source> - <translation>为所选文本着色</translation> + <source>Use custom selection colours</source> + <translation>使用自定义选区颜色</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="474"/> - <source>Select to extend selection to end of line</source> - <translation>选择将选区扩展到行尾</translation> + <source>Select, if selected text should be colourized by the lexer.</source> + <translation>选择所选文本是否由词法分析器着色</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="477"/> + <source>Colourize selected text</source> + <translation>为所选文本着色</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="484"/> + <source>Select to extend selection to end of line</source> + <translation>选择将选区扩展到行尾</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="487"/> <source>Extend selection to end of line</source> <translation>选区扩展到行尾</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="488"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="498"/> <source>Selection foreground:</source> <translation>选区前景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="501"/> - <source>Select the foreground colour for the selection.</source> - <translation>为选区选择前景色。</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="511"/> + <source>Select the foreground colour for the selection.</source> + <translation>为选区选择前景色。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="521"/> <source>Selection background:</source> <translation>选区背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="524"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="534"/> <source>Select the background colour for the selection.</source> <translation>为选区选择背景色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="539"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="549"/> <source>Caret</source> <translation>插入符</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="545"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="555"/> <source>Select, whether the caretline should be highlighted</source> <translation>选择是否高亮显示插入行</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="548"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="558"/> <source>Caretline visible</source> <translation>插入行可见</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="557"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="567"/> <source>Caret width:</source> <translation>插入符宽度:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="574"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>选择插入符宽度(1、2 或 3 像素)</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="597"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="607"/> <source>Caret foreground:</source> <translation>插入符前景:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="610"/> - <source>Select the colour for the caret.</source> - <translation>为插入符选择颜色。</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="620"/> + <source>Select the colour for the caret.</source> + <translation>为插入符选择颜色。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="630"/> <source>Caretline background:</source> <translation>插入行背景:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="633"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="643"/> <source>Select the background colour for the line containing the caret.</source> <translation>为包含插入符的行选择背景色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="648"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="658"/> <source>Debugging Line Markers</source> <translation>调试行标记</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="654"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="664"/> <source>Current line marker:</source> <translation>当前行标记:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="667"/> - <source>Select the colour for the current line marker.</source> - <translation>为当前行标记选择颜色。</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="677"/> + <source>Select the colour for the current line marker.</source> + <translation>为当前行标记选择颜色。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="687"/> <source>Error line marker:</source> <translation>错误行标记:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> <source>Select the colour for the error line marker.</source> <translation>为错误行标记选择颜色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="703"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="713"/> <source>Braces</source> <translation>括号</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> - <source>Select whether matching and bad braces shall be highlighted.</source> - <translation>选择是否对配对和不配对的括号进行高亮显示。</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="712"/> - <source>Highlight braces</source> - <translation>高亮显示括号</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="719"/> + <source>Select whether matching and bad braces shall be highlighted.</source> + <translation>选择是否对配对和不配对的括号进行高亮显示。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> + <source>Highlight braces</source> + <translation>高亮显示括号</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> <source>Matched braces:</source> <translation>已配对的括号:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="732"/> - <source>Select the colour for highlighting matching braces.</source> - <translation>为高亮显示的配对括号选择颜色。</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="742"/> + <source>Select the colour for highlighting matching braces.</source> + <translation>为高亮显示的配对括号选择颜色。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> <source>Matched braces background:</source> <translation>已配对括号背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="755"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> <source>Select the background colour for highlighting matching braces.</source> <translation>为高亮显示的配对括号选择背景色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> <source>Unmatched brace:</source> <translation>未配对的括号:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="778"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="788"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>为高亮显示的未配对括号选择颜色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> <source>Unmatched brace background:</source> <translation>未配对括号背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="801"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="811"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>为高亮显示的未配对括号选择背景色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="814"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>End of Line</source> <translation>行尾</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="822"/> - <source>Select whether end of line shall be shown</source> - <translation>选择是否显示行尾符</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="825"/> - <source>Show End of Line</source> - <translation>显示行尾</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="832"/> - <source>Select, whether long lines should be wrapped</source> - <translation>选择比较长的行是否转行显示</translation> + <source>Select whether end of line shall be shown</source> + <translation>选择是否显示行尾符</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="835"/> + <source>Show End of Line</source> + <translation>显示行尾</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="842"/> + <source>Select, whether long lines should be wrapped</source> + <translation>选择比较长的行是否转行显示</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="845"/> <source>Wrap long lines</source> <translation>长行转行显示</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="844"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="854"/> <source>Edge Mode</source> <translation>边界模式</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="888"/> - <source>Select the colour for the edge marker.</source> - <translation>为边界标记选择颜色。</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="898"/> + <source>Select the colour for the edge marker.</source> + <translation>为边界标记选择颜色。</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="908"/> <source>Background colour:</source> <translation>背景色:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="921"/> <source>Move to set the edge column.</source> <translation>移动可设定边界列。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="939"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="949"/> <source>Displays the selected tab width.</source> <translation>显示已选择的制表符宽度</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="955"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="965"/> <source>Column number:</source> <translation>列数:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="962"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="972"/> <source>Mode:</source> <translation>模式:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="976"/> - <source>Disabled</source> - <translation>已禁用</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="981"/> - <source>Draw Line</source> - <translation>显示边界线</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="986"/> + <source>Disabled</source> + <translation>已禁用</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> + <source>Draw Line</source> + <translation>显示边界线</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="996"/> <source>Change Background Colour</source> <translation>改变背景颜色</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1057"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1067"/> <source>Various</source> <translation>其它</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1063"/> - <source>Select whether whitspace characters shall be shown</source> - <translation>选择是否显示空格符号</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> - <source>Show Whitespace</source> - <translation>显示空格</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1073"/> - <source>Select to show a minimalistic context menu</source> - <translation>选择显示简化的上下文菜单</translation> + <source>Select whether whitspace characters shall be shown</source> + <translation>选择是否显示空格符号</translation> </message> <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1076"/> + <source>Show Whitespace</source> + <translation>显示空格</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1083"/> + <source>Select to show a minimalistic context menu</source> + <translation>选择显示简化的上下文菜单</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1086"/> <source>Show minimal context menu</source> <translation>显示最简上下文菜单</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1000"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1010"/> <source>Zoom</source> <translation type="unfinished">缩放</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1006"/> - <source>Initial zoom factor:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1016"/> + <source>Initial zoom factor:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1026"/> <source>Move to set the initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1038"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="1048"/> <source>Displays the selected initial zoom factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="257"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="267"/> <source>Arrow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="262"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="272"/> <source>Arrow Tree</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="343"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="353"/> <source>Foldmarkers foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="356"/> - <source>Select the foreground colour of the foldmarkers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="366"/> + <source>Select the foreground colour of the foldmarkers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="376"/> <source>Foldmarkers background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="379"/> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="389"/> <source>Select the background colour of the foldmarkers</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/EditorStylesPage.ui" line="37"/> + <source><b>Note:</b> Fonts and colors of the syntax highlighters have to be configured on the syntax highlighter styles page.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorTypingPage</name> @@ -12301,22 +12306,22 @@ <translation>替换</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="57"/> + <location filename="UI/FindFileDialog.py" line="58"/> <source>Stop</source> <translation>中止</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="61"/> + <location filename="UI/FindFileDialog.py" line="62"/> <source>Find</source> <translation>查找</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source>Replace in Files</source> <translation>在文件中替换</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="497"/> + <location filename="UI/FindFileDialog.py" line="500"/> <source>Select directory</source> <translation>选择文件夹</translation> </message> @@ -12341,35 +12346,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="606"/> + <location filename="UI/FindFileDialog.py" line="624"/> <source>Open</source> <translation type="unfinished">打开</translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="607"/> + <location filename="UI/FindFileDialog.py" line="625"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source>Invalid search expression</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="336"/> + <location filename="UI/FindFileDialog.py" line="339"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="558"/> + <location filename="UI/FindFileDialog.py" line="562"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/FindFileDialog.py" line="581"/> + <location filename="UI/FindFileDialog.py" line="599"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/FindFileDialog.py" line="575"/> + <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -44010,7 +44020,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="849"/> + <location filename="Utilities/__init__.py" line="864"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>可以在字符串中使用“%-代码”作为占位符。支持的代码有:<table><tr><td>%C</td><td>当前编辑器的光标所在列</td></tr><tr><td>%D</td><td>当前编辑器的文件夹</td></tr><tr><td>%F</td><td>当前编辑器的文件名</td></tr><tr><td>%H</td><td>当前用户的根目录</td></tr><tr><td>%L</td><td>当前编辑器的光标所在行</td></tr><tr><td>%P</td><td>当前项目的路径</td></tr><tr><td>%S</td><td>当前编辑器中选择的文本</td></tr><tr><td>%U</td><td>当前用户的用户名</td></tr><tr><td>%%</td><td>百分比符号</td></tr></table></p></translation> </message>