[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 1da3bf10bf -s ours
am skip reason: subject contains skip directive

Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff