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

Change-Id: I871472cb73d956e6f4c0db622025b63d2ecd7789