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

Change-Id: If57b94e48ee96d4fcdae85cd0550319f30199bf0