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, 5 insertions, 5 deletions

diff --git a/translations/assistant_uk.ts b/translations/assistant_uk.ts
index 67c1731..85fcd2d 100644
--- a/translations/assistant_uk.ts
+++ b/translations/assistant_uk.ts
@@ -259,10 +259,14 @@ Reason:
         <translation>Адреса</translation>
     </message>
     <message>
-        <source>Toolbar Menu</source>
+        <source>Bookmarks Toolbar</source>
         <translation>Панель закладок</translation>
     </message>
     <message>
+        <source>Toolbar Menu</source>
+        <translation type="vanished">Панель закладок</translation>
+    </message>
+    <message>
         <source>Bookmarks Menu</source>
         <translation>Меню закладок</translation>
     </message>
@@ -1106,10 +1110,6 @@ Reason:
         <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) 2015 The Qt Company Ltd та/або її дочірні компанії.&lt;/p&gt;</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) 2015 The Qt Company Ltd.&lt;/p&gt;</source>
-        <translation type="obsolete">&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) 2015 The Qt Company Ltd та/або її дочірні компанії.&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>About %1</source>
         <translation>Про %1</translation>
     </message>