[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8f1b7c7702 -s ours am: 7f8ad43801 -s ours
am: fb333334e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I95abf2da3c3c582be6826cf4674c97fbfeb9450b
This commit is contained in: