[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
am: 8ca571f9be -s ours
am skip reason: subject contains skip directive
Change-Id: Ida3bd3cf5febf94828981e71997025170febedbf
This commit is contained in: