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