[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 91d2a1cc28 -s ours
am skip reason: subject contains skip directive

Change-Id: I001faae53f9d13e39737d2d7f7bc1fdaaa439f92