* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b2c0a717 -s ours am: 8d22bf28 -s ours am: 51d1c6ec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83cbcff4 -s ours am: 057fec4e -s ours am: 0fbd3d6c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1af18bc9 -s ours am: 31b55b12 -s ours am: d830ce0f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5be0671e -s ours am: f9ddf5d1 -s ours am: a97b57b0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d8e20e69 -s ours am: fa5545e9 -s ours am: fa8ed457 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5552a875 -s ours am: c8fdfede -s ours am: 07ffce3b -s ours