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

Change-Id: Ieb9563ed8d266bd8cf8853fccd9fcef1fb36b4f6