Mercurial Repositories > eric / file diff

--- a/i18n/eric6_ru.ts	Thu Nov 01 15:43:03 2018 +0100
+++ b/i18n/eric6_ru.ts	Thu Nov 01 18:46:44 2018 +0100
@@ -43983,27 +43983,27 @@
 <context>
     <name>LogViewerEdit</name>
     <message>
-        <location filename="../UI/LogView.py" line="118"/>
+        <location filename="../UI/LogView.py" line="121"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="119"/>
+        <location filename="../UI/LogView.py" line="122"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="121"/>
+        <location filename="../UI/LogView.py" line="124"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="123"/>
+        <location filename="../UI/LogView.py" line="126"/>
         <source>Select All</source>
         <translation>Выбрать всё</translation>
     </message>
     <message>
-        <location filename="../UI/LogView.py" line="125"/>
+        <location filename="../UI/LogView.py" line="128"/>
         <source>Configure...</source>
         <translation>Настроить...</translation>
     </message>
@@ -60936,32 +60936,32 @@
 <context>
     <name>SearchReplaceWidget</name>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="151"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/>
         <source>Find Next</source>
         <translation>Найти далее</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="158"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="159"/>
         <source>Find Prev</source>
         <translation>Найти предыдущее</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="790"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="794"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; не найдено.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="919"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="925"/>
         <source>Replaced {0} occurrences.</source>
         <translation>Заменено в {0} местах.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="924"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="930"/>
         <source>Nothing replaced because &apos;{0}&apos; was not found.</source>
         <translation>Ничего не заменено, потому что &apos;{0}&apos; не найдено.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="58"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="59"/>
         <source>&lt;b&gt;Find and Replace&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text and replace it with another text.
 By checking the various checkboxes, the search can be made more specific.
@@ -60976,7 +60976,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="69"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="70"/>
         <source>&lt;b&gt;Find&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text. By checking the various checkboxes,
 the search can be made more specific. The search string might be a regular
@@ -60990,17 +60990,32 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="80"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="167"/>
+        <source>Replace and Search</source>
+        <translation>Заменить и найти</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="177"/>
+        <source>Replace Occurrence</source>
+        <translation>Заменить вхождение</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="187"/>
+        <source>Replace All</source>
+        <translation>Заменить все</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="81"/>
         <source>&lt;table border=&quot;0&quot;&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;.&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Matches any character&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;code&gt;\(&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the start of a region for tagging a
+&lt;tr&gt;&lt;td&gt;&lt;code&gt;(&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the start of a region for tagging a
 match.&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;code&gt;\)&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the end of a tagged region.
+&lt;tr&gt;&lt;td&gt;&lt;code&gt;)&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the end of a tagged region.
 &lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;\n&lt;/code&gt;&lt;/td&gt;
 &lt;td&gt;Where &lt;code&gt;n&lt;/code&gt; is 1 through 9 refers to the first through ninth
 tagged region when replacing. For example, if the search string was
-&lt;code&gt;Fred\([1-9]\)XXX&lt;/code&gt; and the replace string was
+&lt;code&gt;Fred([1-9])XXX&lt;/code&gt; and the replace string was
 &lt;code&gt;Sam\1YYY&lt;/code&gt;, when applied to &lt;code&gt;Fred2XXX&lt;/code&gt; this would
 generate &lt;code&gt;Sam2YYY&lt;/code&gt;.&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;\&amp;lt;&lt;/code&gt;&lt;/td&gt;
@@ -61035,21 +61050,6 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="166"/>
-        <source>Replace and Search</source>
-        <translation>Заменить и найти</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="176"/>
-        <source>Replace Occurrence</source>
-        <translation>Заменить вхождение</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="186"/>
-        <source>Replace All</source>
-        <translation>Заменить все</translation>
-    </message>
 </context>
 <context>
     <name>SearchWidget</name>
@@ -61104,7 +61104,7 @@
         <translation>Выражение не найдено.</translation>
     </message>
     <message>
-        <location filename="../UI/SearchWidget.py" line="201"/>
+        <location filename="../UI/SearchWidget.py" line="217"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; не найдено.</translation>
     </message>
@@ -61138,6 +61138,11 @@
         <source>&amp;Selection only</source>
         <translation>&amp;Только выделенный</translation>
     </message>
+    <message>
+        <location filename="../UI/SearchWidget.ui" line="94"/>
+        <source>Regexp</source>
+        <translation type="unfinished">Регулярное выражение</translation>
+    </message>
 </context>
 <context>
     <name>SearchWidgetLine</name>
@@ -61176,6 +61181,11 @@
         <source>Whole word</source>
         <translation>Целое слово</translation>
     </message>
+    <message>
+        <location filename="../UI/SearchWidgetLine.ui" line="111"/>
+        <source>Regexp</source>
+        <translation type="unfinished">Регулярное &amp;выражение</translation>
+    </message>
 </context>
 <context>
     <name>SecurityPage</name>