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

Change-Id: Iac2d679d1b1a2bdc24fbf5d0829b6bd45030b7bc