Rework autotooling and setup i18n

Signed-off-by: David Zeuthen <davidz@redhat.com>

32 files changed, 79 insertions, 559 deletions

diff --git a/Makefile.am b/Makefile.am
index 416e279..f6655aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 NULL =
 
 # NOTE: 'tests' subdir is disabled for now
-SUBDIRS = data udisks src tools policy doc
+SUBDIRS = data udisks src tools policy po doc
 
 EXTRA_DIST = 			\
 	HACKING 		\
diff --git a/autogen.sh b/autogen.sh
index 22d5457..7688f86 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,103 +1,20 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-touch ChangeLog
-
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-DIE=0
+PKG_NAME="udisks"
 
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
+(test -f $srcdir/src/Makefile.am) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common"
+    exit 1
 }
 
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi
+. gnome-autogen.sh --enable-gtk-doc $*
diff --git a/configure.ac b/configure.ac
index 50a31a9..59c7056 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,135 +1,35 @@
-dnl Process this file with autoconf to produce a configure script.
+AC_INIT([udisks],[1.90.0],[http://bugs.freedesktop.org/enter_bug.cgi?product=udisks],[udisks])
+
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_HEADERS([config.h])
 
-AC_PREREQ(2.59c)
-AC_INIT(udisks, 1.90.0, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks)
-AM_INIT_AUTOMAKE(udisks, 1.90.0)
-AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
-AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
+AC_ISC_POSIX
 AC_HEADER_STDC
-AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PROG_LN_S
-AC_SYS_LARGEFILE
-AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-# Taken from dbus
-AC_ARG_ENABLE(ansi,             [  --enable-ansi           enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
-AC_ARG_ENABLE(verbose-mode,     [  --enable-verbose-mode   support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(man-pages,        [  --enable-man-pages      build manual pages],enable_man_pages=$enableval,enable_man_pages=yes)
-AC_ARG_ENABLE(profiling,        [  --enable-profiling      add tracing instrumentation for plot-timeline.py], enable_profiling=$enableval,enable_profiling=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(strict,           [  --enable-strict         Enable strict compilation options], enable_strict=$enableval,enable_strict=no)
+# Initialization
+#
 
-if test "x$enable_profiling" = "xyes"; then
-  AC_DEFINE(PROFILING, 1, [Define to 1 if profiling is enabled ])
-fi
+GNOME_COMMON_INIT
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
 
-if test "${enable_man_page}" != no; then
-dnl
-dnl Check for xsltproc
-dnl
 AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    enable_man_pages=no
-  fi
+if test -z "$XSLTPROC"; then
+  AC_MSG_ERROR([xsltproc is needed])
 fi
-AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
 
 GTK_DOC_CHECK([1.3])
 
-#### gcc warning flags
-
-if test "x$GCC" = "xyes"; then
-  changequote(,)dnl
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wchar-subscripts[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wmissing-declarations[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wnested-externs[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wpointer-arith[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wcast-align[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wcast-align" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wsign-compare[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wsign-compare" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wformat[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wformat" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wformat-security[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wformat-security" ;;
-  esac
-
-  if test "x$enable_ansi" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-ansi[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-D_POSIX_C_SOURCE*) ;;
-    *) CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-D_BSD_SOURCE[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -D_BSD_SOURCE" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-pedantic[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -pedantic" ;;
-    esac
-  fi
-
-  if test "x$enable_strict" = "xyes"; then
-    CFLAGS="$CFLAGS -Werror"
-  fi
-
-  changequote([,])dnl
-fi
-
-have_sgutils="false"
-AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
-if test x$have_sgutils != "xtrue"; then
-   AC_MSG_ERROR([libsgutils2 is needed])
-fi
-SGUTILS_CFLAGS=""
-SGUTILS_LIBS="-lsgutils2"
-AC_SUBST(SGUTILS_CFLAGS)
-AC_SUBST(SGUTILS_LIBS)
-
+# Libraries
+#
 
 PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
 AC_SUBST(GUDEV_CFLAGS)
@@ -143,69 +43,27 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.25.7 gdbus-codegen])
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.82])
-AC_SUBST(DBUS_GLIB_CFLAGS)
-AC_SUBST(DBUS_GLIB_LIBS)
-
 PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.92])
 AC_SUBST(POLKIT_GOBJECT_1_CFLAGS)
 AC_SUBST(POLKIT_GOBJECT_1_LIBS)
 
-PKG_CHECK_MODULES(POLKIT_BACKEND_1, [polkit-backend-1 >= 0.92])
-AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
-AC_SUBST(POLKIT_BACKEND_1_LIBS)
-
 PKG_CHECK_MODULES(POLKIT_AGENT_1, [polkit-agent-1 >= 0.92])
 AC_SUBST(POLKIT_AGENT_1_CFLAGS)
 AC_SUBST(POLKIT_AGENT_1_LIBS)
 
-PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
-AC_SUBST(LIBPARTED_CFLAGS)
-AC_SUBST(LIBPARTED_LIBS)
+# Internationalization
+#
 
-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-AC_SUBST(DEVMAPPER_CFLAGS)
-AC_SUBST(DEVMAPPER_LIBS)
+IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
+GETTEXT_PACKAGE=udisks2
+AC_SUBST([GETTEXT_PACKAGE])
+AM_GLIB_GNU_GETTEXT
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 
-have_lvm2=no
-AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
-if test "x$enable_lvm2" != "xno"; then
-  PKG_CHECK_MODULES(LVM2, lvm2app >= 2.2,
-                    [AC_DEFINE(HAVE_LVM2, 1, [Define if LVM2 is available]) have_lvm2=yes],
-                    have_lvm2=no)
-  AC_SUBST(LVM2_CFLAGS)
-  AC_SUBST(LVM2_LIBS)
-  if test "x$have_lvm2" = xno -a "x$enable_lvm2" = xyes; then
-    AC_MSG_ERROR([lvm2 support requested but libraries not found])
-  fi
-fi
-AM_CONDITIONAL(HAVE_LVM2, [test "$have_lvm2" = "yes"])
+# slash dir stuff
+#
 
-have_dmmp=no
-AC_ARG_ENABLE(dmmp, AS_HELP_STRING([--disable-dmmp], [disable dm-multipath support]))
-if test "x$enable_dmmp" != "xno"; then
-  have_dmmp=yes
-  AC_DEFINE(HAVE_DMMP, 1, [Define to 1 if dmmp is available])
-fi
-AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"])
-
-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-AC_SUBST(LIBATASMART_CFLAGS)
-AC_SUBST(LIBATASMART_LIBS)
-
-PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143])
-AC_SUBST(LIBUDEV_CFLAGS)
-AC_SUBST(LIBUDEV_LIBS)
-
-if test "x$GCC" = "xyes"; then
-  LDFLAGS="-Wl,--as-needed $LDFLAGS"
-fi
-
-if test "$prefix" = "/usr" -o "$prefix" = "/usr/local" ; then
+if test "$prefix" = "/usr" -o "$prefix" = "/usr/local" -o "$prefix" = "NONE" ; then
   privlibdir=/lib/udisks2
   slashlibdir=/lib
   slashsbindir=/sbin
@@ -218,6 +76,9 @@ AC_SUBST(privlibdir)
 AC_SUBST(slashlibdir)
 AC_SUBST(slashsbindir)
 
+# Generate
+#
+
 AC_OUTPUT([
 Makefile
 data/Makefile
@@ -229,6 +90,7 @@ tools/Makefile
 doc/Makefile
 doc/version.xml
 doc/man/Makefile
+po/Makefile.in
 policy/Makefile
 tests/Makefile
 ])
@@ -254,14 +116,7 @@ echo "
         compiler:                   ${CC}
         cflags:                     ${CFLAGS}
         cppflags:                   ${CPPFLAGS}
-        strict (-Werror):           ${enable_strict}
-        xsltproc:                   ${XSLTPROC}
-
-        LVM2 support:               ${have_lvm2}
-        dm-multipath:               ${have_dmmp}
 
         Maintainer mode:            ${USE_MAINTAINER_MODE}
-        Profiling:                  ${enable_profiling}
         Building api docs:          ${enable_gtk_doc}
-        Building man pages:         ${enable_man_pages}
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 555ac2e..dfda50a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_DIST = 						\
 	org.freedesktop.UDisks2.xml			\
 	$(service_in_files)				\
 	$(dbusconf_in_files)				\
-	udisks2.service					\
 	$(NULL)
 
 clean-local :
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 89bc533..c6b691d 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,8 +1,6 @@
 
 NULL =
 
-if MAN_PAGES_ENABLED
-
 man_MANS = 				\
 	udisksctl.1			\
 	udisksd.8			\
@@ -18,8 +16,6 @@ udisksd.8 : udisksd.xml
 udisks.7 : udisks.xml
 	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-endif # MAN_PAGES_ENABLED
-
 EXTRA_DIST= 				\
 	udisksctl.xml			\
 	udisksd.xml			\
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/po/LINGUAS
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..efeb5b3
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,3 @@
+[encoding: UTF-8]
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..ce3e2ea
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,7 @@
+# List of files where to skip translations.
+# Please keep this file sorted alphabetically.
+policy/org.freedesktop.udisks2.policy.in
+src/udisksiscsiprovider.c
+src/udiskslinuxblock.c
+src/udiskslinuxfilesystem.c
+udisks/udisksutil.c
diff --git a/src/gposixsignal.c b/src/gposixsignal.c
index 2b99d88..4bed9ca 100644
--- a/src/gposixsignal.c
+++ b/src/gposixsignal.c
@@ -22,6 +22,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <unistd.h>
 #include <sys/signalfd.h>
diff --git a/src/main.c b/src/main.c
index e09cc66..57be63f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,8 @@
  */
 
 #include "config.h"
+#include <glib/gi18n.h>
+
 #include <signal.h>
 #include <gio/gio.h>
 
diff --git a/src/polkit-action-lookup.c b/src/polkit-action-lookup.c
deleted file mode 100644
index 62199b2..0000000
--- a/src/polkit-action-lookup.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#include "config.h"
-
-#include <polkitbackend/polkitbackend.h>
-
-#include <glib/gi18n-lib.h>
-
-#define UDISKS_TYPE_ACTION_LOOKUP          (udisks_action_lookup_get_type())
-#define UDISKS_ACTION_LOOKUP(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookup))
-#define UDISKS_ACTION_LOOKUP_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookupClass))
-#define UDISKS_ACTION_LOOKUP_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookupClass))
-#define UDISKS_IS_ACTION_LOOKUP(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), UDISKS_TYPE_ACTION_LOOKUP))
-#define UDISKS_IS_ACTION_LOOKUP_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), UDISKS_TYPE_ACTION_LOOKUP))
-
-typedef struct _UDisksActionLookup UDisksActionLookup;
-typedef struct _UDisksActionLookupClass UDisksActionLookupClass;
-
-struct _UDisksActionLookup
-{
-  GObject parent;
-};
-
-struct _UDisksActionLookupClass
-{
-  GObjectClass parent_class;
-};
-
-GType udisks_action_lookup_get_type (void) G_GNUC_CONST;
-
-static void
-polkit_backend_action_lookup_iface_init (PolkitBackendActionLookupIface *iface);
-
-#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)          \
-  {                                                                     \
-  const GInterfaceInfo g_implement_interface_info = {                   \
-    (GInterfaceInitFunc) iface_init, NULL, NULL                         \
-  };                                                                    \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (UDisksActionLookup,
-    udisks_action_lookup,
-    G_TYPE_OBJECT,
-    0,
-    _G_IMPLEMENT_INTERFACE_DYNAMIC (POLKIT_BACKEND_TYPE_ACTION_LOOKUP,
-        polkit_backend_action_lookup_iface_init))
-
-static void
-udisks_action_lookup_init (UDisksActionLookup *lookup)
-{
-}
-
-static void
-udisks_action_lookup_class_finalize (UDisksActionLookupClass *klass)
-{
-}
-
-static void
-udisks_action_lookup_class_init (UDisksActionLookupClass *klass)
-{
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
-  const gchar *name;
-  const gchar *message;
-} Map;
-
-static const Map map[] =
-  {
-    { "PartitionDelete", N_ ("Authentication is required to delete a partition"), },
-    { "FilesystemCreate", N_ ("Authentication is required to create a filesystem") },
-    { "PartitionCreate", N_ ("Authentication is required to create a partition") },
-    { "PartitionModify", N_ ("Authentication is required to modify a partition") },
-    { "PartitionTableCreate", N_ ("Authentication is required to create a partition table") },
-    { "FilesystemSetLabel", N_ ("Authentication is required to set the file system label") },
-    { "LinuxMdStop", N_ ("Authentication is required to stop a Software RAID device") },
-    { "LinuxMdCheck", N_ ("Authentication is required to check a Software RAID device") },
-    { "LinuxMdRepair", N_ ("Authentication is required to repair a Software RAID device") },
-    { "LinuxMdAddComponent", N_ ("Authentication is required to add a new component to a Software RAID device") },
-    { "LinuxMdRemoveComponent", N_ ("Authentication is required to remove a component from a Software RAID device") },
-    { "LinuxMdStart", N_ ("Authentication is required to start a Software RAID device") },
-    { "LinuxMdCreate", N_ ("Authentication is required to create a Software RAID device") },
-    { "DriveInhibitPolling", N_ ("Authentication is required to inhibit polling on a drive") },
-    { "DrivePollMedia", N_ ("Authentication is required to poll for media") },
-    { "InhibitAllPolling", N_ ("Authentication is required to inhibit all drive polling") },
-    { NULL, NULL, }
-  };
-
-static gchar *
-udisks_action_lookup_get_message (PolkitBackendActionLookup *lookup,
-                                  const gchar *action_id,
-                                  PolkitDetails *details,
-                                  PolkitActionDescription *action_description)
-{
-  const gchar *operation;
-  gchar *ret;
-  guint n;
-
-  ret = NULL;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    goto out;
-
-  operation = polkit_details_lookup (details, "operation");
-  if (operation == NULL)
-    goto out;
-
-  for (n = 0; map[n].name != NULL; n++)
-    {
-      if (g_strcmp0 (map[n].name, operation) != 0)
-        continue;
-
-      ret = g_strdup (g_dgettext (GETTEXT_PACKAGE, map[n].message));
-      break;
-    }
-
- out:
-  return ret;
-}
-
-static gchar *
-udisks_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup,
-                                    const gchar *action_id,
-                                    PolkitDetails *details,
-                                    PolkitActionDescription *action_description)
-{
-  gchar *ret;
-
-  ret = NULL;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    goto out;
-
-  /* explicitly left blank for now */
-
-  out:
-  return ret;
-}
-
-static PolkitDetails *
-udisks_action_lookup_get_details (PolkitBackendActionLookup *lookup,
-                                  const gchar *action_id,
-                                  PolkitDetails *details,
-                                  PolkitActionDescription *action_description)
-{
-  const gchar *s;
-  const gchar *s2;
-  const gchar *s3;
-  GString *str;
-  PolkitDetails *ret;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    return NULL;
-
-  ret = polkit_details_new ();
-
-  /* see daemon_local_check_auth() in daemon.c
-   * for where these keys are set
-   */
-
-  s = polkit_details_lookup (details, "unix-device");
-  if (s != NULL)
-    polkit_details_insert (ret, _ ("Device"), s);
-
-  s = polkit_details_lookup (details, "drive-vendor");
-  s2 = polkit_details_lookup (details, "drive-model");
-  s3 = polkit_details_lookup (details, "drive-revision");
-  str = g_string_new (NULL);
-  if (s != NULL)
-    {
-      g_string_append (str, s);
-    }
-  if (s2 != NULL)
-    {
-      if (str->len > 0)
-        g_string_append_c (str, ' ');
-      g_string_append (str, s2);
-    }
-  if (s3 != NULL)
-    {
-      if (str->len > 0)
-        g_string_append_c (str, ' ');
-      g_string_append_printf (str, "(%s)", s3);
-    }
-
-  if (str->len > 0)
-    {
-      polkit_details_insert (ret, _ ("Drive"), str->str);
-    }
-  g_string_free (str, TRUE);
-
-  return ret;
-}
-
-static void
-polkit_backend_action_lookup_iface_init (PolkitBackendActionLookupIface *iface)
-{
-  iface->get_message = udisks_action_lookup_get_message;
-  iface->get_icon_name = udisks_action_lookup_get_icon_name;
-  iface->get_details = udisks_action_lookup_get_details;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void
-g_io_module_load (GIOModule *module)
-{
-  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-  udisks_action_lookup_register_type (G_TYPE_MODULE (module));
-
-  g_io_extension_point_implement (POLKIT_BACKEND_ACTION_LOOKUP_EXTENSION_POINT_NAME,
-                                  UDISKS_TYPE_ACTION_LOOKUP,
-                                  "udisks action lookup extension " PACKAGE_VERSION,
-                                  0);
-}
-
-void
-g_io_module_unload (GIOModule *module)
-{
-}
diff --git a/src/udisksbasejob.c b/src/udisksbasejob.c
index c9534c4..a0aedee 100644
--- a/src/udisksbasejob.c
+++ b/src/udisksbasejob.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c
index 2f3c31a..41ee789 100644
--- a/src/udisksdaemon.c
+++ b/src/udisksdaemon.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <syslog.h>
 
diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c
index 4febf19..0e9aa6b 100644
--- a/src/udisksdaemonutil.c
+++ b/src/udisksdaemonutil.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/udisksfstabprovider.c b/src/udisksfstabprovider.c
index c36cdb9..5aae8c4 100644
--- a/src/udisksfstabprovider.c
+++ b/src/udisksfstabprovider.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <mntent.h>
diff --git a/src/udisksiscsiprovider.c b/src/udisksiscsiprovider.c
index 0b977f7..5c67ad1 100644
--- a/src/udisksiscsiprovider.c
+++ b/src/udisksiscsiprovider.c
@@ -19,10 +19,7 @@
  */
 
 #include "config.h"
-
-/* TODO: fix up */
-#define N_(x) x
-#define _(x) x
+#include <glib/gi18n-lib.h>
 
 /* TODO:
  *
diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index d077e58..8812e94 100644
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -19,10 +19,7 @@
  */
 
 #include "config.h"
-
-/* TODO: fix up */
-#define N_(x) x
-#define _(x) x
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index 796abd3..e9072a3 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <pwd.h>
@@ -34,10 +35,6 @@
 #include "udiskspersistentstore.h"
 #include "udisksdaemonutil.h"
 
-/* TODO: fix up */
-#define N_(x) x
-#define _(x) x
-
 /**
  * SECTION:udiskslinuxfilesystem
  * @title: UDisksLinuxFilesystem
diff --git a/src/udiskslinuxlun.c b/src/udiskslinuxlun.c
index 91e5863..0182ccc 100644
--- a/src/udiskslinuxlun.c
+++ b/src/udiskslinuxlun.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/udiskslinuxprovider.c b/src/udiskslinuxprovider.c
index 093589e..45ddc15 100644
--- a/src/udiskslinuxprovider.c
+++ b/src/udiskslinuxprovider.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 
diff --git a/src/udisksmount.c b/src/udisksmount.c
index 4aaf682..d4dea09 100644
--- a/src/udisksmount.c
+++ b/src/udisksmount.c
@@ -18,9 +18,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
index 7d9434c..c49083e 100644
--- a/src/udisksmountmonitor.c
+++ b/src/udisksmountmonitor.c
@@ -18,9 +18,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/udiskspersistentstore.c b/src/udiskspersistentstore.c
index 5cde31e..e18e26a 100644
--- a/src/udiskspersistentstore.c
+++ b/src/udiskspersistentstore.c
@@ -18,9 +18,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/udisksprovider.c b/src/udisksprovider.c
index 21ac69a..e457629 100644
--- a/src/udisksprovider.c
+++ b/src/udisksprovider.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <mntent.h>
diff --git a/src/udiskssimplejob.c b/src/udiskssimplejob.c
index 810684b..b8bcdf3 100644
--- a/src/udiskssimplejob.c
+++ b/src/udiskssimplejob.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c
index 71e82fa..e2fc84a 100644
--- a/src/udisksspawnedjob.c
+++ b/src/udisksspawnedjob.c
@@ -19,10 +19,10 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
-
 #include <string.h>
 
 #include "udisksbasejob.h"
diff --git a/src/udisksthreadedjob.c b/src/udisksthreadedjob.c
index fe5e5ae..891171e 100644
--- a/src/udisksthreadedjob.c
+++ b/src/udisksthreadedjob.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/tools/udisksctl.c b/tools/udisksctl.c
index cc56728..a4ba7c8 100644
--- a/tools/udisksctl.c
+++ b/tools/udisksctl.c
@@ -18,9 +18,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
+#include <glib/gi18n.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
index 01586ae..4640455 100644
--- a/tools/umount-udisks.c
+++ b/tools/umount-udisks.c
@@ -18,9 +18,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
+#include <glib/gi18n.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
index f14687a..96b4124 100644
--- a/udisks/udisksclient.c
+++ b/udisks/udisksclient.c
@@ -19,12 +19,7 @@
  */
 
 #include "config.h"
-
-#include <string.h>
-
-//#include <glib/gi18n-lib.h>
-#define _(x) x
-
+#include <glib/gi18n-lib.h>
 
 #include "udisksclient.h"
 #include "udiskserror.h"
diff --git a/udisks/udiskserror.c b/udisks/udiskserror.c
index 2ca2f42..d5601d6 100644
--- a/udisks/udiskserror.c
+++ b/udisks/udiskserror.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include "udiskserror.h"
 
diff --git a/udisks/udisksutil.c b/udisks/udisksutil.c
index b882932..6d02dfc 100644
--- a/udisks/udisksutil.c
+++ b/udisks/udisksutil.c
@@ -19,12 +19,7 @@
  */
 
 #include "config.h"
-
-#include <string.h>
-
-//#include <glib/gi18n-lib.h>
-#define _(x) x
-#define N_(x) x
+#include <glib/gi18n-lib.h>
 
 #include "udisksutil.h"