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