[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff
-s ours
am: 1e7de9c312
-s ours
am skip reason: subject contains skip directive
Change-Id: Idc4cf9cadf4845d9c3bb7ccf8bfb4937d9ce9cdd
This commit is contained in: