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

Change-Id: Ic5103f34ff298a62fe94b79324af827e32a07ac1