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

Change-Id: If31e9a914b932407a92cc71f08059c85121c3eb9