5 files changed, 19 insertions, 12 deletions
diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index e0278bb..15526f6 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -40,7 +40,11 @@ extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-open-terminal.caja-extension.desktop.in
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
+if USE_NLS
 $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
 
 DISTCLEANFILES = \
 org.mate.caja-open-terminal.gschema.xml
diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c
index b2d18e5..e14a9bf 100644
--- a/open-terminal/caja-open-terminal.c
+++ b/open-terminal/caja-open-terminal.c
@@ -22,15 +22,16 @@
 */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h> /* for GETTEXT_PACKAGE */
+#include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "caja-open-terminal.h"
 
 #include <libcaja-extension/caja-menu-provider.h>
 #include <libcaja-extension/caja-configurable.h>
 
-#include <glib/gi18n-lib.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkmain.h>
@@ -91,7 +92,7 @@ get_terminal_file_info (CajaFileInfo *file_info)
 return ret;
 }
 
-char *
+static char *
 lookup_in_data_dir (const char *basename,
 const char *data_dir)
 {
@@ -260,7 +261,6 @@ append_sftp_info (char **terminal_exec,
 g_assert (terminal_exec != NULL);
 g_assert (file_info != NULL);
 
-
 vfs_uri = g_file_new_for_uri (caja_file_info_get_activation_uri (file_info));
 g_assert (vfs_uri != NULL);
 
@@ -520,7 +520,7 @@ caja_open_terminal_get_background_items (CajaMenuProvider *provider,
 }
 }
 
-GList *
+static GList *
 caja_open_terminal_get_file_items (CajaMenuProvider *provider,
 GtkWidget *window,
 GList *files)
@@ -640,6 +640,7 @@ caja_open_terminal_register_type (GTypeModule *module)
 sizeof (CajaOpenTerminal),
 0,
 (GInstanceInitFunc) caja_open_terminal_instance_init,
+ NULL
 };
 
 static const GInterfaceInfo menu_provider_iface_info = {
diff --git a/open-terminal/caja-open-terminal.h b/open-terminal/caja-open-terminal.h
index c5c0dc1..21b6b36 100644
--- a/open-terminal/caja-open-terminal.h
+++ b/open-terminal/caja-open-terminal.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 * instantiated by caja. It implements the GInterfaces
 * exported by libcaja. */
 
-
 #define CAJA_TYPE_OPEN_TERMINAL (caja_open_terminal_get_type ())
 #define CAJA_OPEN_TERMINAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_OPEN_TERMINAL, CajaOpenTerminal))
 #define CAJA_IS_OPEN_TERMINAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_OPEN_TERMINAL))
diff --git a/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in b/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
index 6ac32b2..d097b16 100644
--- a/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
+++ b/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
@@ -4,6 +4,6 @@ Icon=terminal
 Name=Open terminal
 Description=Open terminals from folders
 Author=Christian Neumair <[email protected]>
-Copyright=Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Copyright=Copyright (C) 2004-2005 Free Software Foundation, Inc.\nCopyright (C) 2013-2014 Stefano Karapetsas\nCopyright (C) 2015-2021 MATE developers
 Version=@VERSION@
-Website=https://mate-desktop.org/
+Website=@PACKAGE_URL@
diff --git a/open-terminal/open-terminal.c b/open-terminal/open-terminal.c
index ff21ec1..073d438 100644
--- a/open-terminal/open-terminal.c
+++ b/open-terminal/open-terminal.c
@@ -22,12 +22,14 @@
 */
 
 #ifdef HAVE_CONFIG_H
- #include <config.h>
+#include <config.h>
 #endif
 
-#include "caja-open-terminal.h"
+#include <glib/gi18n-lib.h>
+
+#include <libcaja-extension/caja-extension-types.h>
 
-#include <libintl.h>
+#include "caja-open-terminal.h"
 
 static GType type_list[1];
 
@@ -38,9 +40,10 @@ caja_module_initialize (GTypeModule *module)
 
 caja_open_terminal_register_type (module);
 type_list[0] = CAJA_TYPE_OPEN_TERMINAL;
-
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif /* ENABLE_NLS */
 }
 
 void