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