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

Change-Id: Ib882f7ae005c6358df053564a24c80ca94e42f64