* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7297f19c -s ours am: 149ad93c -s ours am: c303c855 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25e90a4f -s ours am: 987a5a9b -s ours am: 12381728 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a58229fb -s ours am: 3d3ce721 -s ours am: a331aa56 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 579717c4 -s ours am: 8e5e70ce -s ours am: 7e94b3b2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 5a2d22c9 -s ours am: 8a56cbca -s ours am: cf89567d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6d12979 -s ours am: ebc339ad -s ours am: f21d0fd0 -s ours