[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a03bec9f92
-s ours
am: 307b384057
-s ours
am skip reason: subject contains skip directive
Change-Id: I5ad434f1a1e28a27e797fbad28d42372cb2c2668
main
commit
55b938cc76