* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767f760d -s ours am: 40078fd6 -s ours am: 5c9260fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba26fd93 -s ours am: 89fa007c -s ours am: 05a499b7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 182a70a5 -s ours am: 5ce67b33 -s ours am: a11858dd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e2d7365 -s ours am: 6fabd3b7 -s ours am: f7cffa3a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 644a0092 -s ours am: e72ba54f -s ours am: f29bd517 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0855b6c5 -s ours am: 319fba39 -s ours am: 839f8481 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 00bff7ae -s ours am: 31e8f8f8 -s ours am: 9e369c91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ceeb185 -s ours am: 5c200740 -s ours am: 9a5b62bb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 829a7255 -s ours am: 2e64f60c -s ours am: 75a58680 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6b23280 -s ours am: 8fd06f41 -s ours am: e40aaa3b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb938cd7 -s ours am: 3f2e79ce -s ours am: 1f626867 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 633a07df -s ours am: 1f6051e6 -s ours am: 1e01b476 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1a03ebbd -s ours am: 3e1aebaa -s ours am: 4bc868fd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef4fbaba -s ours am: 091b2914 -s ours am: 982184d4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7993daf2 -s ours am: 205ad3cc -s ours am: 29b51544 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e6d43b -s ours am: 01709e78 -s ours am: fa5f798d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 345c3e2e -s ours am: f4eac29f -s ours am: 9018b457 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 304c1d88 -s ours am: 7cf80b00 -s ours am: 3f1d8161 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cfe84569 -s ours am: 3cb0ac31 -s ours am: 30ef7f34 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4d8ee53 -s ours am: 2a94534b -s ours am: bad8df03 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 711bf2f3 -s ours am: 687e00a0 -s ours am: 4562dcbd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da792e36 -s ours am: 8490a316 -s ours am: 74f983e1 -s ours