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