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

Change-Id: Ia8d601df47f9c47eb4453e7b2d0959d806191a32