[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: de521e7d3d -s ours am: 15ced1102b -s ours
am: e1e2df5d96 -s ours
am skip reason: subject contains skip directive
Change-Id: I452e085762067a48fc4840035ce19a81c2de1636
This commit is contained in: