am f879705f: (-s ours) am 80f87055: am 24b09336: Import revised translations. DO...
Eric Fischer [Tue, 22 Mar 2011 21:06:24 +0000 (14:06 -0700)]
* commit 'f879705f947cd4a6e1aaa9f485b6b6f184a43fb8':
  Import revised translations.  DO NOT MERGE


Trivial merge