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

Change-Id: I98cf4fdb78853f9f7590d72f46372c796b909c67