[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours am: 8ca571f9be -s ours
am: 605e269e57 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaec2d861c935c78aefe4fb9e4e1b84dcdb96aa19
This commit is contained in: