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

Change-Id: I7352b253a4d8870f4a9078e4be0454d81dbcd58c