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

Conflicts:
	.qmake.conf

Change-Id: I062a3f534e82af13cb344882c620d861890019a2

2 files changed, 240 insertions, 2 deletions

diff --git a/translations/qtbase_fi.ts b/translations/qtbase_fi.ts
index a8fb896..8980c6a 100644
--- a/translations/qtbase_fi.ts
+++ b/translations/qtbase_fi.ts
@@ -6214,7 +6214,7 @@ Role of an accessible object</extracomment>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation>&amp;Leikkaa</translation>
+        <translation>L&amp;eikkaa</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -6226,7 +6226,7 @@ Role of an accessible object</extracomment>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>L&amp;iitä</translation>
+        <translation>&amp;Liitä</translation>
     </message>
     <message>
         <source>Delete</source>
diff --git a/translations/qtquickcontrols_fi.ts b/translations/qtquickcontrols_fi.ts
new file mode 100644
index 0000000..0c29a35
--- /dev/null
+++ b/translations/qtquickcontrols_fi.ts
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fi">
+<context>
+    <name>DefaultColorDialog</name>
+    <message>
+        <source>Hue</source>
+        <translation>Sävy</translation>
+    </message>
+    <message>
+        <source>Saturation</source>
+        <translation>Kylläisyys</translation>
+    </message>
+    <message>
+        <source>Luminosity</source>
+        <translation>Valoisuus</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Alfa</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultDialogWrapper</name>
+    <message>
+        <source>Show Details...</source>
+        <translation>Näytä yksityiskohdat…</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultFileDialog</name>
+    <message>
+        <source>Go up to the folder containing this one</source>
+        <translation>Siirry ylös kansioon, joka sisältää tämän kansion</translation>
+    </message>
+    <message>
+        <source>Remove favorite</source>
+        <translation>Poista suosikki</translation>
+    </message>
+    <message>
+        <source>Add the current directory as a favorite</source>
+        <translation>Lisää nykyinen kansio suosikiksi</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation>Tiedostonimi</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <comment>file type (extension)</comment>
+        <translation>Tyyppi</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <comment>file size</comment>
+        <translation>Koko</translation>
+    </message>
+    <message>
+        <source>Modified</source>
+        <comment>last-modified time</comment>
+        <translation>Muutettu</translation>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <comment>last-accessed time</comment>
+        <translation>Käytetty</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultFontDialog</name>
+    <message>
+        <source>Font</source>
+        <translation>Fontti</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Lihavuus</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Koko</translation>
+    </message>
+    <message>
+        <source>Font Family</source>
+        <translation>Fonttiperhe</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation>Tyyli</translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation>Kursivoitu</translation>
+    </message>
+    <message>
+        <source>Underline</source>
+        <translation>Alleviivattu</translation>
+    </message>
+    <message>
+        <source>Overline</source>
+        <translation>Ylleviivattu</translation>
+    </message>
+    <message>
+        <source>Strikeout</source>
+        <translation>Yliviivattu</translation>
+    </message>
+    <message>
+        <source>Writing System</source>
+        <translation>Kirjoitusjärjestelmä</translation>
+    </message>
+    <message>
+        <source>Sample</source>
+        <translation>Näyte</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultMessageDialog</name>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Avaa</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Tallenna</translation>
+    </message>
+    <message>
+        <source>Save All</source>
+        <translation>Tallenna kaikki</translation>
+    </message>
+    <message>
+        <source>Retry</source>
+        <translation>Yritä uudelleen</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Ohita</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Käytä</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Kyllä</translation>
+    </message>
+    <message>
+        <source>Yes to All</source>
+        <translation>Kyllä kaikkiin</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Ei</translation>
+    </message>
+    <message>
+        <source>No to All</source>
+        <translation>Ei kaikkiin</translation>
+    </message>
+    <message>
+        <source>Discard</source>
+        <translation>Hylkää</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>Palauta</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation>Palauta oletukset</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Keskeytä</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <source>Show Details...</source>
+        <translation>Näytä yksityiskohdat…</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Ohje</translation>
+    </message>
+    <message>
+        <source>Hide Details</source>
+        <translation>Piilota yksityiskohdat</translation>
+    </message>
+</context>
+<context>
+    <name>EditMenu_base</name>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>L&amp;eikkaa</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>K&amp;opioi</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Liitä</translation>
+    </message>
+</context>
+</TS>