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