From 91b6521886b9578f9851a82a06b48218617395b8 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 6 Jan 2021 12:24:26 -0300 Subject: [PATCH] Fixing translation file conflicts. --- configure.ac | 3 +++ locale/Makefile.in | 15 ++++++++------- src/dialogs/security.c | 1 - src/filetransfer/private.h | 1 - src/include/config.h.in | 1 + src/include/internals.h | 1 - src/terminal/accessible.c | 1 - src/terminal/drawing/oia.c | 1 - src/terminal/security.c | 1 - src/trace/private.h | 1 - src/trace/tracewindow.c | 2 +- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 493643f..8eb36ae 100644 --- a/configure.ac +++ b/configure.ac @@ -159,6 +159,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"libv3270-$app_vrs_major.$app_vrs_minor",[The gettext package name.]) +AC_SUBST(GETTEXT_PACKAGE,"libv3270-$app_vrs_major.$app_vrs_minor") + AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) diff --git a/locale/Makefile.in b/locale/Makefile.in index 9255b83..2268f58 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -33,6 +33,7 @@ datarootdir=@datarootdir@ localedir=${datarootdir}/locale PACKAGE_NAME=@PACKAGE_NAME@ +GETTEXT_PACKAGE=@GETTEXT_PACKAGE@ PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PRODUCT_NAME=@PRODUCT_NAME@ @@ -50,21 +51,21 @@ INSTALL_DATA=@INSTALL_DATA@ #---[ Rules ]---------------------------------------------------------------------------- %.po: \ - $(PACKAGE_NAME).pot + $(GETTEXT_PACKAGE).pot @echo $(basename $@) ... - @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot + @$(MSGMERGE) --update --sort-output $@ $(GETTEXT_PACKAGE).pot @touch $@ -$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ +$(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \ %.po @echo $< ... @$(MKDIR) `dirname $@` @$(MSGFMT) -c -v -o $@ $^ -$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ - $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo +$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \ + $(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo @echo $< ... @$(MKDIR) `dirname $@` @@ -73,10 +74,10 @@ $(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ #---[ Targets ]-------------------------------------------------------------------------- all: \ - $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo) install: \ - $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) + $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo) diff --git a/src/dialogs/security.c b/src/dialogs/security.c index 43fab71..35e9ebb 100644 --- a/src/dialogs/security.c +++ b/src/dialogs/security.c @@ -30,7 +30,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/filetransfer/private.h b/src/filetransfer/private.h index e0a6a02..73373fe 100644 --- a/src/filetransfer/private.h +++ b/src/filetransfer/private.h @@ -35,7 +35,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/include/config.h.in b/src/include/config.h.in index feb7789..7487314 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -35,6 +35,7 @@ #undef PACKAGE_VERSION #undef PACKAGE_RELEASE #undef PRODUCT_NAME + #undef GETTEXT_PACKAGE #undef HAVE_LIBM diff --git a/src/include/internals.h b/src/include/internals.h index 9557193..abd8ad2 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -34,7 +34,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/terminal/accessible.c b/src/terminal/accessible.c index da2ae12..0c763a4 100644 --- a/src/terminal/accessible.c +++ b/src/terminal/accessible.c @@ -30,7 +30,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/terminal/drawing/oia.c b/src/terminal/drawing/oia.c index d26c01f..6c32618 100644 --- a/src/terminal/drawing/oia.c +++ b/src/terminal/drawing/oia.c @@ -35,7 +35,6 @@ #endif // WIN32 #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/terminal/security.c b/src/terminal/security.c index 1652e66..8a7fd74 100644 --- a/src/terminal/security.c +++ b/src/terminal/security.c @@ -30,7 +30,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/trace/private.h b/src/trace/private.h index 38d8774..3e2cc2b 100644 --- a/src/trace/private.h +++ b/src/trace/private.h @@ -34,7 +34,6 @@ #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include diff --git a/src/trace/tracewindow.c b/src/trace/tracewindow.c index 378a015..99f9592 100644 --- a/src/trace/tracewindow.c +++ b/src/trace/tracewindow.c @@ -36,10 +36,10 @@ * */ + #include #include #define ENABLE_NLS - #define GETTEXT_PACKAGE PACKAGE_NAME #include #include -- libgit2 0.21.2