[gnome-disk-utility/wip/mdraid: 16/16] Merge branch 'master' into wip/mdraid

[David Zeuthen <davidz src gnome org>]

commit 2718157d692320cf6f89be6f738281b0810f545c
Merge: c66ac0a bda6f36
Author: David Zeuthen <zeuthen gmail com>
Date:   Wed Sep 26 12:48:11 2012 -0400

    Merge branch 'master' into wip/mdraid

 data/gnome-disk-image-mounter.desktop.in |    1 +
 po/ca.po                                 | 2119 +++++++++++++++++--------
 po/ca valencia po                        | 2126 +++++++++++++++++--------
 po/de.po                                 |  942 +++++++-----
 po/et.po                                 | 1192 +++++++++++----
 po/fi.po                                 |  678 +++++----
 po/kn.po                                 | 2517 ++++++++++++++++++-----------
 po/lv.po                                 | 2296 +++++++++++++++++----------
 po/pa.po                                 | 1289 ++++++++--------
 po/pt_BR.po                              | 2584 +++++++++++++++++++-----------
 po/sl.po                                 |   24 +-
 po/th.po                                 |  379 ++---
 po/uk.po                                 | 1864 +++++++++++-----------
 po/zh_CN.po                              |   24 +-
 14 files changed, 11202 insertions(+), 6833 deletions(-)
---