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

[David Zeuthen <davidz src gnome org>]

commit 949a2b641480a39bee3e4962517eedc62374c573
Merge: ecc2ce3 f3f4a04
Author: David Zeuthen <zeuthen gmail com>
Date:   Thu Sep 13 10:44:12 2012 -0400

    Merge branch 'master' into wip/mdraid
    
    Pull latest changes from master

 data/ui/benchmark-dialog.ui          |    1 +
 data/ui/disk-settings-dialog.ui      |    1 +
 data/ui/edit-crypttab-dialog.ui      |    1 +
 data/ui/edit-dos-partition-dialog.ui |   41 +-
 data/ui/edit-filesystem-dialog.ui    |   26 +-
 data/ui/edit-fstab-dialog.ui         |    1 +
 data/ui/edit-gpt-partition-dialog.ui |   38 +-
 data/ui/edit-partition-dialog.ui     |   46 +-
 data/ui/format-disk-dialog.ui        |  131 +-
 data/ui/format-volume-dialog.ui      |   40 +-
 data/ui/smart-dialog.ui              |    1 +
 po/as.po                             | 1001 +++---
 po/be.po                             | 1174 +++---
 po/de.po                             | 2346 +++++++-----
 po/el.po                             | 2145 ++++++-----
 po/en_GB.po                          | 2103 +++++++----
 po/fi.po                             | 2480 +++++++++----
 po/fr.po                             | 1944 +++++++----
 po/gl.po                             |  197 +-
 po/he.po                             | 2587 ++++++++-----
 po/hu.po                             | 6781 ++++++++++++----------------------
 po/id.po                             |  609 ++--
 po/it.po                             | 4128 ++++-----------------
 po/lt.po                             | 1229 +++----
 po/mr.po                             | 1088 +++---
 po/pl.po                             | 1951 +++++++----
 po/sl.po                             | 2045 +++++++----
 po/sr.po                             |  833 +++--
 po/sr latin po                       |  833 +++--
 po/ta.po                             | 2161 +++++++----
 po/uk.po                             | 2813 +++++++++------
 po/vi.po                             | 6609 ++++++++++++++-------------------
 src/disks/gduapplication.c           |    7 -
 33 files changed, 23829 insertions(+), 23562 deletions(-)
---