[file-roller] Most of file-roller appears untranslated

[Paolo Bacchilega <paobac src gnome org>]

commit 60ef92b66fec1ba86736fbe0df1db5b0a28a2d63
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Mar 30 10:50:31 2016 +0200

    Most of file-roller appears untranslated
    
    removed custom definition of LOCALEDIR
    
    [bug #764342]

 configure.ac                 |    6 ------
 nautilus/Makefile.am         |    2 +-
 nautilus/fileroller-module.c |   10 +++++-----
 src/Makefile.am              |    1 +
 4 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 50bda8a..151e61e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,12 +255,6 @@ GETTEXT_PACKAGE=file-roller
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
 
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Locale dir])
-else
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Locale dir])
-fi
-
 dnl ******************************
 
 YELP_HELP_INIT
diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
index fec5573..69900ae 100644
--- a/nautilus/Makefile.am
+++ b/nautilus/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS =                                          \
        -DFR_DATADIR=\"$(datadir)\"                     \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+       -DLOCALEDIR=\"$(localedir)\"                    \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        $(DISABLE_DEPRECATED)                           \
diff --git a/nautilus/fileroller-module.c b/nautilus/fileroller-module.c
index e6ebf99..4a45750 100644
--- a/nautilus/fileroller-module.c
+++ b/nautilus/fileroller-module.c
@@ -1,6 +1,6 @@
 /*
  *  File-Roller
- * 
+ *
  *  Copyright (C) 2004 Free Software Foundation, Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Author: Paolo Bacchilega <paobac cvs gnome org>
- * 
+ *
  */
 
 #include <config.h>
@@ -33,7 +33,7 @@ nautilus_module_initialize (GTypeModule*module)
 {
        nautilus_fr_register_type (module);
 
-       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
@@ -44,12 +44,12 @@ nautilus_module_shutdown (void)
 }
 
 
-void 
+void
 nautilus_module_list_types (const GType **types,
                            int          *num_types)
 {
        static GType type_list[1];
-       
+
        type_list[0] = NAUTILUS_TYPE_FR;
        *types = type_list;
        *num_types = 1;
diff --git a/src/Makefile.am b/src/Makefile.am
index 3970f9d..1bd1d8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ AM_CPPFLAGS =                                         \
        -DPRIVEXECDIR=\"$(privexecdir)\"                \
        -DSHDIR=\"$(shdir)\"                            \
        -DAPPLICATIONS_DIR=\"$(applications_dir)\"      \
+       -DLOCALEDIR=\"$(localedir)\"                    \
        $(DISABLE_DEPRECATED)                           \
        $(FR_CFLAGS)                                    \
        $(JSON_GLIB_CFLAGS)                             \