* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 743a409a -s ours am: 43807ee6 -s ours am: 182d1ac5 -s ours am: 12620183 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 652acf3f -s ours am: 69a73dbe -s ours am: 6d5edd9a -s ours am: fbd58db2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33068439 -s ours am: 0d3a011d -s ours am: 926a55cb -s ours am: 98cd24e9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b2ee8b6 -s ours am: b26acd74 -s ours am: 37634ed3 -s ours am: 03e779bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a073762d -s ours am: b88c6ed0 -s ours am: efb74735 -s ours am: 2c6708af -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa5e605 -s ours am: 218039a3 -s ours am: cc4ef45c -s ours am: 58afa2fa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 03fafec4 -s ours am: 535f5c8b -s ours am: ecf864a5 -s ours am: 84c1a966 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a472bcef -s ours am: df65818a -s ours am: e1abab74 -s ours am: ddac5192 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e27f35d9 -s ours am: 2c3d59e2 -s ours am: 85adaa98 -s ours am: bc700962 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f3fc1ef -s ours am: b83d9893 -s ours am: 6ed03615 -s ours am: a7e2ebea -s ours