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

Change-Id: Ic1beb9d4bda31e6fa92bbd62613f6314801e0c08