* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a473278a -s ours am: 0f7ba64e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b23944d -s ours am: 3cc51641 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d65610e3 -s ours am: 41682d55 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eae3add7 -s ours am: 93907f80 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a88f8c4e -s ours am: 41d273c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24135ddd -s ours am: b0a904a3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1c24b581 -s ours am: 92b096f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bbafc7 -s ours am: 0dd9b1fe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db1d5b80 -s ours am: d855e6b6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4c4bd6 -s ours am: a07d7c74 -s ours