[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa
-s ours
am: d4ac3ef39a
-s ours
am skip reason: subject contains skip directive
Change-Id: I34df32a7ca6f22128da89514139383bac56cd965
This commit is contained in: