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