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

Change-Id: I0f7a43e64309d3ce82a06bed01a44f3aa01af4f9