[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341
-s ours am: 1da3bf10bf
-s ours
am: 025db3d33e
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib025fe85d46cc77ce24e94e758b9b3bfa8e5bac8
This commit is contained in: