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

Change-Id: Ia31f4271fdd82a5e940a0aa35dfcf5e02252a5a4