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

Change-Id: If0932adfc5173c164be6d064666f12980b5c71b4