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