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