--- a/i18n/eric5_ru.ts Fri Mar 07 19:15:46 2014 +0100 +++ b/i18n/eric5_ru.ts Fri Mar 07 19:20:36 2014 +0100 @@ -15328,7 +15328,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="537"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -15523,17 +15523,17 @@ <translation>Заменить</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="607"/> + <location filename="../UI/FindFileDialog.py" line="617"/> <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="648"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <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> @@ -15558,12 +15558,12 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="675"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> @@ -15578,7 +15578,7 @@ <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="622"/> + <location filename="../UI/FindFileDialog.py" line="632"/> <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>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation> </message> @@ -15587,6 +15587,30 @@ <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/FindFileDialog.py" line="491"/> + <source>{0} / {1}</source> + <comment>occurrences / files</comment> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n occurrence(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> @@ -25887,7 +25911,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="244"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -25984,72 +26008,72 @@ <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="148"/> <source>modified</source> <translation>изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> <source>removed</source> <translation>удалено</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <source>not tracked</source> + <translation>не отслеживается</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> - <source>not tracked</source> - <translation>не отслеживается</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> - <source>ignored</source> - <translation>игнорировано</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <source>ignored</source> + <translation>игнорировано</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="794"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -26059,12 +26083,12 @@ <translation>Удалить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="715"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -26149,7 +26173,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="515"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -26159,12 +26183,12 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="774"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -26179,7 +26203,7 @@ <translation>Снять выделение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="241"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> @@ -26194,12 +26218,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -26209,12 +26233,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> <source>Add as Large File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> <source>Add as Normal File</source> <translation type="unfinished"></translation> </message>