Mercurial Repositories > eric / file diff

--- a/i18n/eric6_ru.ts	Thu Aug 30 19:37:43 2018 +0200
+++ b/i18n/eric6_ru.ts	Fri Aug 31 17:30:31 2018 +0200
@@ -4806,32 +4806,32 @@
 <context>
     <name>Connection</name>
     <message>
-        <location filename="../Cooperation/Connection.py" line="83"/>
+        <location filename="../Cooperation/Connection.py" line="84"/>
         <source>undefined</source>
         <translation>неопределён</translation>
     </message>
     <message>
-        <location filename="../Cooperation/Connection.py" line="84"/>
+        <location filename="../Cooperation/Connection.py" line="85"/>
         <source>unknown</source>
         <translation>неизвестный</translation>
     </message>
     <message>
-        <location filename="../Cooperation/Connection.py" line="212"/>
+        <location filename="../Cooperation/Connection.py" line="213"/>
         <source>* Connection attempted by banned user &apos;{0}&apos;.</source>
         <translation>* Попытка соединения от запрещённого пользователя &apos;{0}&apos;.</translation>
     </message>
     <message>
-        <location filename="../Cooperation/Connection.py" line="222"/>
+        <location filename="../Cooperation/Connection.py" line="223"/>
         <source>New Connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
-        <location filename="../Cooperation/Connection.py" line="222"/>
+        <location filename="../Cooperation/Connection.py" line="223"/>
         <source>&lt;p&gt;Accept connection from &lt;strong&gt;{0}@{1}&lt;/strong&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Разрешить соединение от&lt;strong&gt;{0}@{1}&lt;/strong&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Cooperation/Connection.py" line="461"/>
+        <location filename="../Cooperation/Connection.py" line="464"/>
         <source>* Connection to {0}:{1} refused.</source>
         <translation>* В подключении к  {0}:{1} отказано.</translation>
     </message>
@@ -35856,12 +35856,12 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/>
-        <source>Select to do a dry-run first, than ask the user for confirmation to perform the rebase</source>
+        <source>Select to do a dry-run first, then ask the user for confirmation to perform the rebase</source>
         <translation>Разрешить сначала выполнять пробный прогон, а затем попросить пользователя подтвердить выполнение перебазирования</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/>
-        <source>Dry-Run First, than Confirm</source>
+        <source>Dry-Run First, then Confirm</source>
         <translation>Сначала пробный прогон, затем подтверждение</translation>
     </message>
 </context>