* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3e866e7e -s ours am: 6e239df7 -s ours am: a001f677 -s ours am: 451c9ea0 -s ours am: 31970fea -s ours am: 0f07bf79 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3cac51 -s ours am: 84d9a6f8 -s ours am: 342d9a27 -s ours am: 77932f5a -s ours am: adbc902c -s ours am: ba77ac57 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a1dd385e -s ours am: 862c66f1 -s ours am: 11b3cca3 -s ours am: 3e98000b -s ours am: e93bcd1f -s ours am: 046029cb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8386276a -s ours am: 25d9f533 -s ours am: 31d2a325 -s ours am: 432f3912 -s ours am: c3bdd7dc -s ours am: da6b7c99 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c1875450 -s ours am: 6b21f4c6 -s ours am: deb33acd -s ours am: 43e82768 -s ours am: 9fc3603e -s ours am: ca46d50d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aa77ca9 -s ours am: e1baf3be -s ours am: 1d3cc07b -s ours am: 26192621 -s ours am: 1b11c21a -s ours am: 47a3e0de -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d7041435 -s ours am: 679c1b3f -s ours am: ebd62f02 -s ours am: 679e110a -s ours am: fe8ffa1e -s ours am: 48c4fac6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8c6a98e -s ours am: f16a090e -s ours am: c9815289 -s ours am: 47e1ac3a -s ours am: 1aaf085c -s ours am: 8d4387d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9044abbb -s ours am: 5a97db54 -s ours am: 9f13d3b8 -s ours am: e4c85f8e -s ours am: b6202614 -s ours am: c68dcd6b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1faccd69 -s ours am: 0ff91770 -s ours am: 75c493b8 -s ours am: a4dcb3cf -s ours am: b11e329e -s ours am: c15b251b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 50f86fe2 -s ours am: 57f93cc0 -s ours am: 0561cd5b -s ours am: eb7ebb31 -s ours am: e3abc3a1 -s ours am: 208323ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7c89365 -s ours am: 98d7c586 -s ours am: ee7c0e0e -s ours am: 88b0e7ee -s ours am: f25d51c2 -s ours am: c007abde -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 000a993b -s ours am: bebdb02b -s ours am: c1c5f1c4 -s ours am: 68461a4c -s ours am: ddb30810 -s ours am: 9dc00d07 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d7f7df7 -s ours am: 75a71684 -s ours am: 082947d0 -s ours am: 25ee7b4c -s ours am: 12a1d414 -s ours am: ffc5c8ff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e88f1fa4 -s ours am: 8d16b930 -s ours am: e2740c7e -s ours am: 31620063 -s ours am: b2da52b7 -s ours am: 5a0438ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 282ae827 -s ours am: e398f2d7 -s ours am: 52b2b31f -s ours am: bfef96c3 -s ours am: a464da1b -s ours am: a343c418 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1c81057 -s ours am: 547ad991 -s ours am: f739d9c1 -s ours am: c4f3af31 -s ours am: 53654cf2 -s ours am: 035f983d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8063f589 -s ours am: 65620b2e -s ours am: df62d66e -s ours am: 19bbd684 -s ours am: ec6099b9 -s ours am: f009e446 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 74f9d50b -s ours am: 49877597 -s ours am: ab7d2775 -s ours am: 66398115 -s ours am: aa9d50e7 -s ours am: 89d3710e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57565ae1 -s ours am: 1c8e33d1 -s ours am: fcab2ffb -s ours am: 9f16e204 -s ours am: b08e9869 -s ours am: ee22d9f9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 180eacef -s ours am: d683995a -s ours am: d31ee827 -s ours am: 0cde880b -s ours am: 29e3190f -s ours am: f0d16b8f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9132e4 -s ours am: 56617538 -s ours am: 1a141189 -s ours am: 31f58d1a -s ours am: a4e93733 -s ours am: 8f19fec8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c1113759 -s ours am: aaef2f53 -s ours am: 914f01af -s ours am: 578ef67c -s ours am: 3ec8e6e3 -s ours am: 205a4dae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57f20b80 -s ours am: e7952a13 -s ours am: 2566e1f6 -s ours am: 7ac022be -s ours am: 731fd1e9 -s ours am: 2448b618 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65dfe8b6 -s ours am: d1031ec3 -s ours am: ae00bf28 -s ours am: 45fc623f -s ours am: 034cd7a5 -s ours am: 72020fa6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3e960d3 -s ours am: 26fa2684 -s ours am: 4b45e497 -s ours am: a11b1eee -s ours am: db27af88 -s ours am: bb049d42 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dd26475b -s ours am: cc936f81 -s ours am: c111b8ef -s ours am: c5d34e2e -s ours am: 802d83fe -s ours am: 4fd967d5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ea9231f -s ours am: 968643c7 -s ours am: c4015271 -s ours am: 9dabf12d -s ours am: 3ad6f28b -s ours am: 058579a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c6525ba -s ours am: e2aec01c -s ours am: 4fbc3ad4 -s ours am: 57f78726 -s ours am: 9f9fe523 -s ours am: 2e55bceb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffea13ab -s ours am: dea49d73 -s ours am: 6746e720 -s ours am: cdf6c2c9 -s ours am: 1c4e8792 -s ours am: 5149f339 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 49fd9674 -s ours am: 50dcaef0 -s ours am: 41582495 -s ours am: b9f85c21 -s ours am: df167358 -s ours am: 53e790d0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb792912 -s ours am: a54daf45 -s ours am: 01512d83 -s ours am: 5084d1e3 -s ours am: fe2df5b4 -s ours am: 79b3a1d2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8c1c08f1 -s ours am: 26640bd2 -s ours am: f17bb897 -s ours am: 23b3410d -s ours am: 366a2e48 -s ours am: 07aaf569 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dcba96f -s ours am: d39b81f2 -s ours am: 1770d596 -s ours am: 57c6afff -s ours am: 624e3201 -s ours am: faacd274 -s ours