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

Change-Id: Id3eeed6a368072136959013b03f8dc1a6cf79793