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