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