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

Change-Id: Iaa83c397172bfff8895d53677ee95611ad92eab5