* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6a497d3e -s ours am: ca973153 -s ours am: 418ec6be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 916f425e -s ours am: 9555e87a -s ours am: 81dfd0a1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d1beeab0 -s ours am: 1970b4b0 -s ours am: 11fe0316 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e25fa06 -s ours am: ad8d832f -s ours am: 5b247289 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ed098cc5 -s ours am: 7f0d4ffa -s ours am: 35cc5b97 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af4f65ae -s ours am: 34923131 -s ours am: bdd7c633 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85bb69ee -s ours am: 82d620c7 -s ours am: c6481d9b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f78d608d -s ours am: cda2c36f -s ours am: 4045dd4d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6cdf4b -s ours am: 9fc70742 -s ours am: 2e1ab107 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00d213be -s ours am: 7169a40b -s ours am: 24bc0587 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c5ffd85 -s ours am: 3f2c6524 -s ours am: 675568c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eacb6fc6 -s ours am: c5933a6a -s ours am: 7c0b5edf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb778a55 -s ours am: 874c8612 -s ours am: 7b992fe2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 508fead4 -s ours am: 92c05bf0 -s ours am: 55a217b3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2308314f -s ours am: 4521eb37 -s ours am: 45894357 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad16fb62 -s ours am: 4f93eb59 -s ours am: fa75d021 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 367bca4f -s ours am: 235865dd -s ours am: 9d81183d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9310b2db -s ours am: 86638c73 -s ours am: 4e58fc8c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 635f2ecc -s ours am: 0fc635e4 -s ours am: 8bc89a9a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c31184e1 -s ours am: d295ebf4 -s ours am: d3a2c8c1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6b4d3db -s ours am: 4cb09dbb -s ours am: 3e83adbb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c989a4c0 -s ours am: e4d80a9c -s ours am: 3e796a83 -s ours