* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 112906ba -s ours am: 71278575 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24b4bb88 -s ours am: 2dd065a1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: cb044645 -s ours am: cd6d8ace -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92926fb5 -s ours am: 687c788e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3d1fe219 -s ours am: 018f4213 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8eacc71a -s ours am: 4fe64d02 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55f2848d -s ours am: 7bc057fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1fcc3c8 -s ours am: f9efc3c0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ac994c6 -s ours am: 0eeb7f1b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e48ec15 -s ours am: d1dd6711 -s ours