--- a/i18n/eric6_ru.ts Tue Mar 07 18:25:42 2017 +0100 +++ b/i18n/eric6_ru.ts Tue Mar 07 18:42:41 2017 +0100 @@ -3539,147 +3539,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="526"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Тройные одинарные кавычки заменены тройными двойными.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="529"/> <source>Introductory quotes corrected to be {0}"""</source> <translation>Кавычки во введении исправлены на {0}"""</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="532"/> <source>Single line docstring put on one line.</source> <translation>Одиночная строка документации распологается в одной строке.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="535"/> <source>Period added to summary line.</source> <translation>Добавлена точка в строке резюме.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="562"/> <source>Blank line before function/method docstring removed.</source> <translation>Удалена пустая строка перед строкой документации для function/method.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="541"/> <source>Blank line inserted before class docstring.</source> <translation>Добавлена пустая строка перед строкой документации для class.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="544"/> <source>Blank line inserted after class docstring.</source> <translation>Добавлена пустая строка после строки документации для class.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="547"/> <source>Blank line inserted after docstring summary.</source> <translation>Добавлена пустая строка после резюме строки документации.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="550"/> <source>Blank line inserted after last paragraph of docstring.</source> <translation>Добавлена пустая строка после последнего абзаца строки документации.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="553"/> <source>Leading quotes put on separate line.</source> <translation>Открывающие кавычки размещены на отдельной строке.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="556"/> <source>Trailing quotes put on separate line.</source> <translation>Закрывающие кавычки размещены на отдельной строке.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="559"/> <source>Blank line before class docstring removed.</source> <translation>Удалена пустая строка перед строкой документации для class.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="565"/> <source>Blank line after class docstring removed.</source> <translation>Удалена пустая строка после строки документации для class.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="568"/> <source>Blank line after function/method docstring removed.</source> <translation>Удалена пустая строка после строки документации для function/method.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="571"/> <source>Blank line after last paragraph removed.</source> <translation>Удалена пустая строка после последнего абзаца.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="574"/> <source>Tab converted to 4 spaces.</source> <translation>Символы табуляции заменяются на 4 пробела.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="577"/> <source>Indentation adjusted to be a multiple of four.</source> <translation>Величина отступа сделана кратной четырём.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="580"/> <source>Indentation of continuation line corrected.</source> <translation>Исправлен размер отступа строки продолжения.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="583"/> <source>Indentation of closing bracket corrected.</source> <translation>Исправлен размер отступа закрывающей скобки.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="586"/> <source>Missing indentation of continuation line corrected.</source> <translation>Добавлен отступ к строке продолжения.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="589"/> <source>Closing bracket aligned to opening bracket.</source> <translation>Закрывающая скобка выровнена с открывающей.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="592"/> <source>Indentation level changed.</source> <translation>Изменен размер отступа.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="595"/> <source>Indentation level of hanging indentation changed.</source> <translation>Изменен размер отступа для висячих отступов.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> <source>Visual indentation corrected.</source> <translation>Исправленена величина визуального отступа.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Extraneous whitespace removed.</source> <translation>Лишние символы пропуска удалены.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> <source>Missing whitespace added.</source> <translation>Добавлены недостающие символы пропуска.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> <source>Whitespace around comment sign corrected.</source> <translation>Символы пропуска вокруг символа комментария откорректированы.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> <source>One blank line inserted.</source> <translation>Добавлена одна пустая строка.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="623"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n пустая строка вставлена.</numerusform> @@ -3688,7 +3688,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="626"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n лишняя пустая строка удалена</numerusform> @@ -3697,77 +3697,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="630"/> <source>Superfluous blank lines removed.</source> <translation>Удалены излишние пустые строки.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="633"/> <source>Superfluous blank lines after function decorator removed.</source> <translation>Удалены пустые строки после декоратора функции.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="636"/> <source>Imports were put on separate lines.</source> <translation>Операторы импорта помещены на отдельных строках.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="639"/> <source>Long lines have been shortened.</source> <translation>Укорочены длинные строки.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="642"/> <source>Redundant backslash in brackets removed.</source> <translation>Удалены излишние символы '\'.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="648"/> <source>Compound statement corrected.</source> <translation>Исправлены составные выражения.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="651"/> <source>Comparison to None/True/False corrected.</source> <translation>Исправлено сравнение с None/True/False.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="654"/> <source>'{0}' argument added.</source> <translation>Добавлен '{0}' аргумент.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="657"/> <source>'{0}' argument removed.</source> <translation>Удалён '{0}' аргумент.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="660"/> <source>Whitespace stripped from end of line.</source> <translation>Завершающие символы пропуска обрезаны.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="663"/> <source>newline added to end of file.</source> <translation>Символ новой строки добавлен в конец файла.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="666"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation>Удалены пустые строки в конце файла.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="669"/> <source>'<>' replaced by '!='.</source> <translation>'<>' заменен на '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="673"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation>Не удалось сохранить файл! Пропускаем. Причина: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="745"/> <source> no message defined for code '{0}'</source> <translation>нет сообщения, определенного для кода '{0}'</translation> </message> @@ -28863,13 +28863,17 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="434"/> - <source>1 or more incoming</source> - <translation>1 или более входящих</translation> - </message> - <message> + <source>1 or more incoming changesets</source> + <translation type="unfinished">1 или более входящих</translation> + </message> + <message numerus="yes"> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="436"/> - <source>{0} outgoing</source> - <translation>{0} исходящих</translation> + <source>%n outgoing changeset(s)</source> + <translation type="unfinished"> + <numerusform>{0} исходящих</numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="445"/> @@ -36749,85 +36753,135 @@ <translation>слепой except: инструкция</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="476"/> <source>found {0} formatter</source> <translation>найден {0} форматтер</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="479"/> <source>format string does contain unindexed parameters</source> <translation>строка формата действительно содержит неиндексированные параметры</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="482"/> <source>docstring does contain unindexed parameters</source> <translation>строка документации действительно содержит неиндексированные параметры</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="485"/> <source>other string does contain unindexed parameters</source> <translation>другая строка действительно содержит неиндексированные параметры</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="488"/> <source>format call uses too large index ({0})</source> <translation>формат вызова использует слишком большой индекс ({0})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="491"/> <source>format call uses missing keyword ({0})</source> <translation>формат вызова использует недостающее ключевое слово ({0})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> <source>format call uses keyword arguments but no named entries</source> <translation>формат вызова использует ключевые аргументы, но нет именованных записей</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>format call uses variable arguments but no numbered entries</source> <translation>формат ячейки использует переменные аргументы, но нет пронумерованных записей</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> <source>format call uses implicit and explicit indexes together</source> <translation>формат вызова использует скрытые и явные индексы вместе</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> <source>format call provides unused index ({0})</source> <translation>формат вызова предоставляет неиспользованный индекс ({0})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>format call provides unused keyword ({0})</source> <translation>Формат вызова предоставляет неиспользованное ключевое слово ({0})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation>ожидался __future__ imports: {0}; получены только: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> <source>expected these __future__ imports: {0}; but got none</source> <translation>ожидался __future__ imports: {0}; не получено ничего</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> <source>print statement found</source> <translation>обнаружен оператор печати</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> <source>one element tuple found</source> <translation>один элемент кортежа найден</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> + <source>"{0}" is a Python builtin and is being shadowed; consider renaming the variable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="448"/> + <source>"{0}" is used as an argument and thus shadows a Python builtin; consider renaming the argument</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="452"/> + <source>unnecessary generator - rewrite as a list comprehension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="455"/> + <source>unnecessary generator - rewrite as a set comprehension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="458"/> + <source>unnecessary generator - rewrite as a dict comprehension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="461"/> + <source>unnecessary list comprehension - rewrite as a set comprehension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="464"/> + <source>unnecessary list comprehension - rewrite as a dict comprehension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="467"/> + <source>unnecessary list literal - rewrite as a set literal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="470"/> + <source>unnecessary list literal - rewrite as a dict literal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="473"/> + <source>unnecessary list comprehension - "{0}" can take a generator</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MouseClickDialog</name>