[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 849354a3d1 -s ours am: 3caa871c0d -s ours
am: 8a24ff76c7 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa9706b8362519e9b2315185da1f023b78dee544