3 files changed, 14 insertions, 0 deletions
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 ();