am ef6f240c: (-s ours) am 7c74ecc6: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Tue, 18 Oct 2011 18:41:20 +0000 (11:41 -0700)]
* commit 'ef6f240c6655cb05509ba79efc9265840cdd065d':
  Import revised translations.  DO NOT MERGE


Trivial merge