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

Change-Id: Ie050b98a20156ea1f9a6514771ce4b99f45737be