* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8f8611e3 -s ours am: ee2adff3 -s ours am: 3212c5ae -s ours am: 6bb2c3b0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5226195f -s ours am: 2ec773ae -s ours am: 64bd9cba -s ours am: df0618a0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8374f77d -s ours am: 103f4ffa -s ours am: 204b32e7 -s ours am: ec7eafc3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1faba4ed -s ours am: 552fed1c -s ours am: 666b587e -s ours am: 43509c2f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4e2ce8fe -s ours am: a0eca52c -s ours am: e99f877e -s ours am: 539340a1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62adb387 -s ours am: c5be6084 -s ours am: 8251bf9c -s ours am: 75e34144 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 51cc3c53 -s ours am: 11049ddd -s ours am: 4094e1be -s ours am: 48667609 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2f48ace -s ours am: 9dc7100d -s ours am: b3d67549 -s ours am: 42de018f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9dc7e98a -s ours am: 889d08a8 -s ours am: f76fc3a2 -s ours am: 112cd2a9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eea3d738 -s ours am: d5f44945 -s ours am: 7ed7b7b8 -s ours am: 7cb7a824 -s ours