21 files changed, 104 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index b56efcc1..561c7d20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,12 @@ distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out' | grep -v
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+if USE_NLS
+PO_SUBDIR = po
+endif
+
 SUBDIRS = \
- po \
+ $(PO_SUBDIR) \
 baobab \
 mate-dictionary \
 mate-screenshot \
diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index a5835007..9794bdcc 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -21,13 +21,22 @@ $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 
 $(baobabapp_DATA): $(baobabapp_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 $(appdata_DATA): $(appdata_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 gsettings_SCHEMAS = org.mate.disk-usage-analyzer.gschema.xml
 @GSETTINGS_RULES@
diff --git a/baobab/help/Makefile.am b/baobab/help/Makefile.am
index feaefec0..3a357ec0 100644
--- a/baobab/help/Makefile.am
+++ b/baobab/help/Makefile.am
@@ -27,10 +27,14 @@ HELP_MEDIA = \
 figures/baobab_treemaps.png \
 figures/baobab_window.png
 
+if USE_NLS
 # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
 IGNORE_HELP_LINGUAS =
 HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
 $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
 $(subst /,,$(dir $(wildcard */*.po))) )
+else
+HELP_LINGUAS =
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 1b942dea..eb015730 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -1227,9 +1227,11 @@ main (int argc, char *argv[])
 GOptionContext *context;
 GError *error = NULL;
 
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 g_set_application_name (_("Disk Usage Analyzer"));
 
diff --git a/configure.ac b/configure.ac
index af76f948..2b1dbb37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,8 +318,10 @@ AS_IF([test "x$enable_zlib" != "xno"],
 AC_SUBST(Z_LIBS)
 
 dnl Internationalization
-AM_GNU_GETTEXT_VERSION([0.19.8])
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
+AM_CONDITIONAL([USE_NLS], [test "x${USE_NLS}" = "xyes"])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define the gettext package to use])
@@ -409,4 +411,5 @@ mate-utils $VERSION configuration summary:
 API Reference (libmatedict) : $enable_gtk_doc
 Logview built with ZLib support : $msg_zlib
 Dictionary mate-panel applet : $enable_gdict_applet
+ Native Language support : ${USE_NLS}
 "
diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am
index a3afbba0..4651ba1b 100644
--- a/gsearchtool/data/Makefile.am
+++ b/gsearchtool/data/Makefile.am
@@ -24,16 +24,26 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-search-tool.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 $(appdata_DATA): $(appdata_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 man_MANS = mate-search-tool.1
 
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-search-tool.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
+
 $(Utilities_DATA): $(Utilities_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 EXTRA_DIST = \
 $(icon_DATA) \
diff --git a/gsearchtool/help/Makefile.am b/gsearchtool/help/Makefile.am
index 52a93666..2f16e2bb 100644
--- a/gsearchtool/help/Makefile.am
+++ b/gsearchtool/help/Makefile.am
@@ -20,10 +20,14 @@ HELP_FILES = index.docbook legal.xml
 
 HELP_MEDIA = figures/mate-search-tool_window.png
 
+if USE_NLS
 # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
 IGNORE_HELP_LINGUAS =
 HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
 $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
 $(subst /,,$(dir $(wildcard */*.po))) )
+else
+HELP_LINGUAS =
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/gsearchtool/src/gsearchtool.c b/gsearchtool/src/gsearchtool.c
index fec6e1ab..e51980c1 100644
--- a/gsearchtool/src/gsearchtool.c
+++ b/gsearchtool/src/gsearchtool.c
@@ -40,7 +40,10 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
+
+#ifdef ENABLE_NLS
 #include <locale.h>
+#endif /* ENABLE_NLS */
 
 #include "gsearchtool.h"
 #include "gsearchtool-callbacks.h"
@@ -3047,13 +3050,17 @@ main (int argc,
 GError * error = NULL;
 EggSMClient * client;
 
+#ifdef ENABLE_NLS
 setlocale (LC_ALL, "");
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 context = g_option_context_new (N_("- the MATE Search Tool"));
+#ifdef ENABLE_NLS
 g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 gsearch_setup_goption_descriptions ();
 g_option_context_add_main_entries (context, GSearchGOptionEntries, GETTEXT_PACKAGE);
 g_option_context_add_group (context, gtk_get_option_group (TRUE));
diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index 15438c88..45f47bb7 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -18,10 +18,16 @@ SUBDIRS=icons
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-system-log.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
 $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in)
 @sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
+
 $(desktop_DATA): $(desktop_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 man_MANS = mate-system-log.1
 
diff --git a/logview/help/Makefile.am b/logview/help/Makefile.am
index eb43152c..cf2b54b7 100644
--- a/logview/help/Makefile.am
+++ b/logview/help/Makefile.am
@@ -20,10 +20,14 @@ HELP_FILES = index.docbook legal.xml
 HELP_MEDIA = \
 figures/syslog_window.png
 
+if USE_NLS
 # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
 IGNORE_HELP_LINGUAS =
 HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
 $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
 $(subst /,,$(dir $(wildcard */*.po))) )
+else
+HELP_LINGUAS =
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/logview/src/logview-main.c b/logview/src/logview-main.c
index 70f3cc83..b64997bc 100644
--- a/logview/src/logview-main.c
+++ b/logview/src/logview-main.c
@@ -67,7 +67,9 @@ create_option_context (void)
 };
 
 context = g_option_context_new (_(" - Browse and monitor logs"));
+#ifdef ENABLE_NLS
 g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 g_option_context_set_ignore_unknown_options (context, TRUE);
 g_option_context_add_group (context, gtk_get_option_group (TRUE));
@@ -82,9 +84,11 @@ main (int argc, char *argv[])
 GOptionContext *context;
 LogviewApp *app;
 
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 context = create_option_context ();
 
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am
index 167b2f35..f47069ba 100644
--- a/mate-dictionary/data/Makefile.am
+++ b/mate-dictionary/data/Makefile.am
@@ -33,7 +33,11 @@ dictsource_in_files = \
 dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 builderdir = $(datadir)/mate-dictionary
 builder_DATA = \
@@ -57,7 +61,11 @@ $(applet_in_files): $(applet_in_files).in Makefile
 $< > $@
 
 $(applet_DATA): $(applet_in_files) Makefile
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.DictionaryAppletFactory.service.in
@@ -75,8 +83,13 @@ endif # BUILD_GDICT_APPLET
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-dictionary.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 $(appdata_DATA): $(appdata_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 gsettings_SCHEMAS = org.mate.dictionary.gschema.xml
 @GSETTINGS_RULES@
diff --git a/mate-dictionary/help/Makefile.am b/mate-dictionary/help/Makefile.am
index a727cbe2..2868fbe4 100644
--- a/mate-dictionary/help/Makefile.am
+++ b/mate-dictionary/help/Makefile.am
@@ -28,10 +28,14 @@ HELP_MEDIA = \
 figures/mate-dictionary-preferences-print.png \
 figures/mate-dictionary-preferences-source.png
 
+if USE_NLS
 # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
 IGNORE_HELP_LINGUAS =
 HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
 $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
 $(subst /,,$(dir $(wildcard */*.po))) )
+else
+HELP_LINGUAS =
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/mate-dictionary/libgdict/gdict-utils.c b/mate-dictionary/libgdict/gdict-utils.c
index 1e6447ed..31f3fad8 100644
--- a/mate-dictionary/libgdict/gdict-utils.c
+++ b/mate-dictionary/libgdict/gdict-utils.c
@@ -156,7 +156,9 @@ gdict_get_option_group (void)
 
 g_option_group_set_parse_hooks (group, pre_parse_hook, post_parse_hook);
 g_option_group_add_entries (group, gdict_args);
+#ifdef ENABLE_NLS
 g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 return group;
 }
diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c
index 9ed518ec..efe9f310 100644
--- a/mate-dictionary/src/gdict-app.c
+++ b/mate-dictionary/src/gdict-app.c
@@ -341,7 +341,9 @@ gdict_init (int *argc, char ***argv)
 /* create the new option context */
 context = g_option_context_new (_(" - Look up words in dictionaries"));
 
+#ifdef ENABLE_NLS
 g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 g_option_context_add_main_entries (context, gdict_app_goptions, GETTEXT_PACKAGE);
 g_option_context_add_group (context, gdict_get_option_group ());
 g_option_context_add_group (context, gtk_get_option_group (TRUE));
diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c
index 25b5fbd0..450de616 100644
--- a/mate-dictionary/src/gdict-applet.c
+++ b/mate-dictionary/src/gdict-applet.c
@@ -1191,8 +1191,10 @@ gdict_applet_factory (MatePanelApplet *applet,
 {
 /* Set up the menu */
 priv->context_menu_action_group = gtk_action_group_new ("Dictionary Applet Actions");
+#ifdef ENABLE_NLS
 gtk_action_group_set_translation_domain(priv->context_menu_action_group,
 GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 gtk_action_group_add_actions(priv->context_menu_action_group,
 gdict_applet_menu_actions,
 G_N_ELEMENTS (gdict_applet_menu_actions),
diff --git a/mate-dictionary/src/main.c b/mate-dictionary/src/main.c
index c6923303..df67f03c 100644
--- a/mate-dictionary/src/main.c
+++ b/mate-dictionary/src/main.c
@@ -26,9 +26,11 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 gdict_init (&argc, &argv);
 
diff --git a/mate-disk-image-mounter/data/Makefile.am b/mate-disk-image-mounter/data/Makefile.am
index f0db6f94..e4db019b 100644
--- a/mate-disk-image-mounter/data/Makefile.am
+++ b/mate-disk-image-mounter/data/Makefile.am
@@ -18,8 +18,13 @@ NULL =
 diskimagemounterdir = $(datadir)/applications
 diskimagemounter_in_files = mate-disk-image-mounter.desktop.in
 diskimagemounter_DATA = $(diskimagemounter_in_files:.desktop.in=.desktop)
+
 $(diskimagemounter_DATA): $(diskimagemounter_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 EXTRA_DIST = \
 $(diskimagemounter_in_files) \
diff --git a/mate-disk-image-mounter/src/main.c b/mate-disk-image-mounter/src/main.c
index 65c283ea..746547b3 100644
--- a/mate-disk-image-mounter/src/main.c
+++ b/mate-disk-image-mounter/src/main.c
@@ -158,9 +158,11 @@ main (int argc, char *argv[])
 GSList *uris = NULL;
 GSList *l;
 
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 have_gtk = gtk_init_check (&argc, &argv);
 
diff --git a/mate-screenshot/data/Makefile.am b/mate-screenshot/data/Makefile.am
index d5603539..d38a91fd 100644
--- a/mate-screenshot/data/Makefile.am
+++ b/mate-screenshot/data/Makefile.am
@@ -16,8 +16,13 @@
 mate_screenshotdir = $(datadir)/applications
 mate_screenshot_in_files = mate-screenshot.desktop.in
 mate_screenshot_DATA = $(mate_screenshot_in_files:.desktop.in=.desktop)
+
 $(mate_screenshot_DATA): $(mate_screenshot_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 man_MANS = mate-screenshot.1
 
@@ -25,7 +30,11 @@ appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-screenshot.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 $(appdata_DATA): $(appdata_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 gsettings_SCHEMAS = org.mate.screenshot.gschema.xml
 @GSETTINGS_RULES@
diff --git a/mate-screenshot/src/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c
index c888d4d7..09bf2e8a 100644
--- a/mate-screenshot/src/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
@@ -31,7 +31,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <locale.h>
+#endif /* ENABLE_NLS */
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <pwd.h>
@@ -1321,10 +1323,12 @@ main (int argc, char *argv[])
 { NULL },
 };
 
+#ifdef ENABLE_NLS
 setlocale (LC_ALL, "");
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 context = g_option_context_new (_("Take a picture of the screen"));
 g_option_context_set_ignore_unknown_options (context, FALSE);