[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours am: da256d6977
-s ours
am: bd154e9399
-s ours
am skip reason: subject contains skip directive
Change-Id: I13b8df5f5dbe206fe65c80c3337aa5da3ead6d97
main
commit
329485655e