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

Change-Id: Iddb5f2ef52732ae808141889bed7c36830b020be