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

Change-Id: Ib2feb1d99f5f2753ccc04c0e352d1fad06d9e4d6