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

Change-Id: I32e5d4d452538b501d9b538e188316dab0548f45