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

Change-Id: Iafbb2cf723f5dad60ae597e59d5cb729df3665a2