am 16a80ea7: (-s ours) am efa4bfce: (-s ours) am 98be4b70: (-s ours) Import translati...
Geoff Mendal [Wed, 15 Oct 2014 22:12:55 +0000 (22:12 +0000)]
* commit '16a80ea74677bfbe19f63cdcef4027b76c89c2ea':
  Import translations. DO NOT MERGE


Trivial merge