[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0
-s ours am: 73a98df64b
-s ours
am: 7303be2997
-s ours
am skip reason: subject contains skip directive
Change-Id: Idd14bfa193826aa6de686adbe03e5e977d3a0e84
This commit is contained in: