[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8f1b7c7702 -s ours am: d4abcd0f46 -s ours
am: 61115d5b47 -s ours
am skip reason: subject contains skip directive
Change-Id: Id15207e1d37b2bc74e1904c5809e27282e8c8695
This commit is contained in: