[gnome-disk-utility/wip/iscsi: 8/9] Merge branch 'master' into wip/iscsi

[David Zeuthen <davidz src gnome org>]

commit 1ca86a1d9e2e0f79101951995317134a8093e14d
Merge: fc2a233 8e716ab
Author: David Zeuthen <davidz redhat com>
Date:   Tue Feb 28 12:26:51 2012 -0500

    Merge branch 'master' into wip/iscsi

 data/ui/edit-crypttab-dialog.ui    |   98 ++++---
 data/ui/edit-fstab-dialog.ui       |   97 ++++---
 data/ui/palimpsest.ui              |    2 +-
 po/es.po                           |  505 +++++++++++++++++----------------
 po/gl.po                           |  521 +++++++++++++++++----------------
 po/ta.po                           |  557 +++++++++++++++++++-----------------
 src/palimpsest/gducrypttabdialog.c |  258 ++++++++++-------
 src/palimpsest/gdufstabdialog.c    |  221 ++++++++------
 8 files changed, 1200 insertions(+), 1059 deletions(-)
---