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