summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac43
-rw-r--r--gksu/Makefile.am4
-rw-r--r--image-converter/Makefile.am4
-rw-r--r--image-converter/caja-image-resizer.c2
-rw-r--r--image-converter/caja-image-rotator.c2
-rw-r--r--open-terminal/Makefile.am4
-rw-r--r--sendto/Makefile.am4
-rw-r--r--sendto/caja-sendto-command.c12
-rw-r--r--share/Makefile.am4
-rw-r--r--share/caja-share.c2
-rw-r--r--wallpaper/Makefile.am4
-rw-r--r--xattr-tags/Makefile.am4
13 files changed, 72 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index 983d77c..4cc1155 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = po
+SUBDIRS =
+
+if USE_NLS
+SUBDIRS += po
+endif
if ENABLE_OPEN_TERMINAL
SUBDIRS += open-terminal
diff --git a/configure.ac b/configure.ac
index a2e0910..96be262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,13 +325,14 @@ AC_MSG_NOTICE([Installing caja plugins in ${ac_with_cajadir}])
AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
# gettext
-AM_GNU_GETTEXT_VERSION([0.19.8])
-AM_GNU_GETTEXT([external])
-
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_CONDITIONAL([USE_NLS], [test "x${USE_NLS}" = "xyes"])
+
DISABLE_DEPRECATED_CPPFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CPPFLAGS)
@@ -367,20 +368,24 @@ AC_OUTPUT([
])
echo "
- caja-extensions $VERSION
- `echo caja-extensions $VERSION | sed "s/./=/g"`
- prefix: ${prefix}
- compiler: ${CC}
- cflags: ${CFLAGS}
- warning flags: ${WARN_CFLAGS}
- caja-extension dir ${ac_with_cajadir}
-
- Plugins to be built:
- Image Converter: $enable_image_converter
- Open Terminal: $enable_open_terminal
- Sendto: $enable_sendto
- Share: $enable_share
- Gksu: $enable_gksu
- Wallpaper: $enable_wallpaper
- xattr Tags: $enable_xattr_tags
+Configure summary:
+
+ ${PACKAGE_STRING}
+ `echo $PACKAGE_STRING | sed "s/./=/g"`
+ prefix: ${prefix}
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+ warning flags: ${WARN_CFLAGS}
+ caja-extension dir: ${ac_with_cajadir}
+ Native Language support: ${USE_NLS}
+
+ Plugins to be built
+ `echo "Plugins to be built" | sed "s/./=/g"`
+ Image Converter: $enable_image_converter
+ Open Terminal: $enable_open_terminal
+ Sendto: $enable_sendto
+ Share: $enable_share
+ Gksu: $enable_gksu
+ Wallpaper: $enable_wallpaper
+ xattr Tags: $enable_xattr_tags
"
diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index e973dff..aac9e40 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -31,7 +31,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-gksu.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
CLEANFILES = $(extension_DATA)
diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am
index 5a9b21e..82c01c0 100644
--- a/image-converter/Makefile.am
+++ b/image-converter/Makefile.am
@@ -47,7 +47,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-image-converter.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
EXTRA_DIST = \
caja-image-resize.ui \
diff --git a/image-converter/caja-image-resizer.c b/image-converter/caja-image-resizer.c
index d8c6221..02484c1 100644
--- a/image-converter/caja-image-resizer.c
+++ b/image-converter/caja-image-resizer.c
@@ -338,7 +338,9 @@ caja_image_resizer_init (CajaImageResizer *resizer)
GtkBuilder *builder;
builder = gtk_builder_new_from_resource ("/org/mate/caja/extensions/imageconverter/caja-image-resize.ui");
+#ifdef ENABLE_NLS
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
/* Grab some widgets */
resizer->resize_dialog = GTK_DIALOG (gtk_builder_get_object (builder, "resize_dialog"));
diff --git a/image-converter/caja-image-rotator.c b/image-converter/caja-image-rotator.c
index 83e76b0..a46901b 100644
--- a/image-converter/caja-image-rotator.c
+++ b/image-converter/caja-image-rotator.c
@@ -340,7 +340,9 @@ caja_image_rotator_init (CajaImageRotator *rotator)
GtkBuilder *builder;
builder = gtk_builder_new_from_resource ("/org/mate/caja/extensions/imageconverter/caja-image-rotate.ui");
+#ifdef ENABLE_NLS
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
/* Grab some widgets */
rotator->rotate_dialog = GTK_DIALOG (gtk_builder_get_object (builder, "rotate_dialog"));
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/sendto/Makefile.am b/sendto/Makefile.am
index c964773..a1e9bb0 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -83,7 +83,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-sendto.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
EXTRA_DIST = \
$(man_MANS) \
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c
index 1574e7e..e7d3698 100644
--- a/sendto/caja-sendto-command.c
+++ b/sendto/caja-sendto-command.c
@@ -445,9 +445,13 @@ set_model_for_options_combobox (NS_ui *ui)
GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter,
- COLUMN_ICON, pixbuf,
- COLUMN_DESCRIPTION, dgettext(p->info->gettext_package, p->info->description),
- -1);
+ COLUMN_ICON, pixbuf,
+#ifdef ENABLE_NLS
+ COLUMN_DESCRIPTION, g_dgettext (p->info->gettext_package, p->info->description),
+#else
+ COLUMN_DESCRIPTION, p->info->description,
+#endif /* ENABLE_NLS */
+ -1);
if (last_used != NULL && !strcmp(last_used, p->info->id)) {
option = i;
last_used_support_dirs = (p->info->capabilities & CAJA_CAPS_SEND_DIRECTORIES);
@@ -799,9 +803,11 @@ int 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 */
context = g_option_context_new ("");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
diff --git a/share/Makefile.am b/share/Makefile.am
index 18e6475..9fa4381 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -41,7 +41,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-share.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
EXTRA_DIST = share-dialog.ui
diff --git a/share/caja-share.c b/share/caja-share.c
index e6b4897..c23c3f0 100644
--- a/share/caja-share.c
+++ b/share/caja-share.c
@@ -694,7 +694,9 @@ create_property_page (CajaFileInfo *fileinfo)
page->ui = gtk_builder_new ();
+#ifdef ENABLE_NLS
gtk_builder_set_translation_domain (page->ui, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
g_assert (gtk_builder_add_from_file (page->ui,
INTERFACES_DIR"/share-dialog.ui", &error));
diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
index c173fc2..6a82f33 100644
--- a/wallpaper/Makefile.am
+++ b/wallpaper/Makefile.am
@@ -33,7 +33,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-wallpaper.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
CLEANFILES = $(extension_DATA)
diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am
index 51e3f59..c593203 100644
--- a/xattr-tags/Makefile.am
+++ b/xattr-tags/Makefile.am
@@ -34,7 +34,11 @@ extensiondir = $(datadir)/caja/extensions
extension_in_files = libcaja-xattr-tags.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
CLEANFILES = $(extension_DATA)