--- 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>