Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	translations/assistant_ru.ts
	translations/assistant_uk.ts
	translations/designer_ru.ts
	translations/designer_uk.ts
	translations/linguist_ru.ts
	translations/linguist_uk.ts
	translations/qtbase_fi.ts
	translations/qtbase_ru.ts
	translations/qtbase_uk.ts

Change-Id: I033f8d700d76360068cb9307d986092fd31cd685

1 files changed, 4 insertions, 0 deletions

diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts
index 119b535..cd34969 100644
--- a/translations/assistant_ru.ts
+++ b/translations/assistant_ru.ts
@@ -789,6 +789,10 @@ Reason:
         <translation>Не удалось найти элемент, связанный с содержанием.</translation>
     </message>
     <message>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Версия %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) %3 Digia Plc и/или её дочерние подразделения.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>