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

Change-Id: Ic1deeadaa3e983323c23f2f7a3e6f3821e5d2b8b