[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: I26af8d2c8caf94dc3a3dd3e2bbdd7170d0914a75