am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 20:43:36 +0000 (20:43 +0000)]
* commit '26bc8ca28401a108dbc0e686441c6501ff525750':
  Import translations. DO NOT MERGE


Trivial merge