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

Change-Id: Ibbc34224cb271ca5f682e735643d3e802a8b48e8