[california/wip/725768-colors: 12/12] Merge branch 'master' into wip/725768-colors

[Jim Nelson <jnelson src gnome org>]

commit 7f9a7078de7609e263a8a461071a6e8aa8ff7cd6
Merge: ab1774f a28e475
Author: Jim Nelson <jim yorba org>
Date:   Thu Mar 20 15:06:56 2014 -0700

    Merge branch 'master' into wip/725768-colors

 po/LINGUAS     |    3 +
 po/POTFILES.in |    1 +
 po/cs.po       |   24 ++++--
 po/es.po       |   27 ++++---
 po/fi.po       |  244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/he.po       |   72 +++++++++++------
 po/hu.po       |  245 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pl.po       |   32 +++++---
 po/pt_BR.po    |   26 ++++---
 po/uk.po       |  244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 852 insertions(+), 66 deletions(-)
---