# HG changeset patch
# User Grigory Ustinov <grenka@altlinux.org>
# Date 1542643412 -10800
# Node ID 43f45bf8169129fce836c66849b322a265c0f313
# Parent  a6332977f39640a7621de7b5e25e9608cef964d2# Parent  91a3aad232975850387fef3096ed640d3e304d5f
Merge with master branch

diff -r 91a3aad23297 -r 43f45bf81691 share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts	Mon Nov 19 13:03:27 2018 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts	Mon Nov 19 19:03:32 2018 +0300
@@ -27,7 +27,7 @@
     <message>
         <source>GNU GPL v2</source>
         <extracomment>Short for “GNU General Public License version 2”</extracomment>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>Dependency versions:</source>
@@ -36,47 +36,47 @@
     </message>
     <message>
         <source>&lt;a href=&quot;https://gcc.gnu.org&quot;&gt;GCC&lt;/a&gt;: %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.libsdl.org/&quot;&gt;SDL2&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.libsdl.org/&quot;&gt;SDL2_mixer&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.libsdl.org/&quot;&gt;SDL2_net&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.libsdl.org/&quot;&gt;SDL2_image&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.libsdl.org/&quot;&gt;SDL2_ttf&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://www.qt.io/developers/&quot;&gt;Qt&lt;/a&gt;: %1</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://libav.org&quot;&gt;libavcodec&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://libav.org&quot;&gt;libavformat&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://libav.org&quot;&gt;libavutil&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>&lt;a href=&quot;https://icculus.org/physfs/&quot;&gt;PhysFS&lt;/a&gt;: %1.%2.%3</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
 </context>
 <context>
@@ -160,7 +160,7 @@
     <name>FeedbackDialog</name>
     <message>
         <source>View</source>
-        <translation>Вид</translation>
+        <translation>Посмотреть</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -172,7 +172,7 @@
     </message>
     <message>
         <source>We are always happy about suggestions, ideas, or bug reports.</source>
-        <translation>Мы всегда рады новым предложениям, идям или сообщениям об ошибках.</translation>
+        <translation>Мы всегда рады новым предложениям, идеям или сообщениям об ошибках.</translation>
     </message>
     <message>
         <source>Send us feedback!</source>
@@ -1219,7 +1219,7 @@
     </message>
     <message>
         <source>Open packages directory</source>
-        <translation>Открыть папку с пакетами</translation>
+        <translation>Открыть папку с контентом</translation>
     </message>
     <message>
         <source>Load the start page</source>
@@ -1378,7 +1378,7 @@
     </message>
     <message>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
 </context>
 <context>
@@ -1903,7 +1903,7 @@
     </message>
     <message>
         <source>Room state</source>
-        <translation>Состояние комнаты</translation>
+        <translation>Фильтр комнат</translation>
     </message>
     <message>
         <source>Clear filters</source>
@@ -1922,7 +1922,7 @@
     </message>
     <message>
         <source>Share your opponents pain, share their damage</source>
-        <translation>Раздели боль врага, раздели с ним его урон</translation>
+        <translation>Раздели боль врага, получи его урон тоже</translation>
     </message>
     <message>
         <source>Your hogs are unable to move, put your artillery skills to the test</source>
@@ -2142,7 +2142,7 @@
     </message>
     <message>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
 </context>
 <context>
@@ -2345,19 +2345,19 @@
     </message>
     <message>
         <source>Show games in lobby</source>
-        <translation>Показывать неначавшиеся игры</translation>
+        <translation>неначавшиеся игры</translation>
     </message>
     <message>
         <source>Show games in-progress</source>
-        <translation>Показывать начавшиеся игры</translation>
+        <translation>начавшиеся игры</translation>
     </message>
     <message>
         <source>Show password protected</source>
-        <translation>Показывать запароленные комнаты</translation>
+        <translation>запароленные комнаты</translation>
     </message>
     <message>
         <source>Show join restricted</source>
-        <translation>Показывать закрытые комнаты</translation>
+        <translation>закрытые комнаты</translation>
     </message>
     <message>
         <source>Delegate room control</source>
@@ -2588,23 +2588,23 @@
     </message>
     <message>
         <source>24 FPS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>25 FPS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>30 FPS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>50 FPS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
     <message>
         <source>60 FPS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation><!--Non-translatable text-->
     </message>
 </context>
 <context>
@@ -2850,7 +2850,7 @@
     </message>
     <message>
         <source>Your Email</source>
-        <translation>Ваш емейл</translation>
+        <translation>Ваш e-mail</translation>
     </message>
     <message>
         <source>Summary</source>
diff -r 91a3aad23297 -r 43f45bf81691 share/hedgewars/Data/misc/hedgewars.desktop
--- a/share/hedgewars/Data/misc/hedgewars.desktop	Mon Nov 19 13:03:27 2018 +0100
+++ b/share/hedgewars/Data/misc/hedgewars.desktop	Mon Nov 19 19:03:32 2018 +0300
@@ -12,7 +12,7 @@
 GenericName[it]=Ricci combattenti
 GenericName[pl]=Walczące jeże
 GenericName[pt]=Batalhas entre ouriços
-GenericName[ru]=Битвы ежей
+GenericName[ru]=Битвы ёжиков
 GenericName[sk]=Bojujúci ježkovia
 GenericName[cs]=Bojující ježci
 GenericName[sv]=Stridande igelkottar
@@ -20,6 +20,7 @@
 Comment=Funny turn-based artillery game, featuring fighting hedgehogs!
 Comment[de]=Lustiges zugbasiertes Artilleriespiel mit kämpfenden Igeln!
 Comment[it]=Gioco divertente di artiglieria a turni, con ricci combattenti!
+Comment[ru]=Весёлая пошаговая стратегия про воющих ёжиков!
 Icon=hedgewars
 Exec=hedgewars %U
 Terminal=false