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