[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours
am: b3c1bb04b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I31eaf1a8e95678a3f92de071e6767db67c29bc72
This commit is contained in: