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

Change-Id: If9388b9fa0837bee7929f3aa1227e6e3391215ba