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

Change-Id: I3d816a129597f5bd27794d6c8756a285d13edb42