[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d2a5f94ba -s ours am: 6833e6e3ca -s ours
am: 3ce200f8d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I07846b5b6011f07e0c0137a644858ad4f29dc5ad