Download as
Browse Code »

Commit 91b6521886b9578f9851a82a06b48218617395b8

Authored by Perry Werneck
1 parent 9c57e1f3
Exists in master and in 1 other branch develop

Fixing translation file conflicts.

Showing 11 changed files with 13 additions and 15 deletions   Show diff stats
@@ -159,6 +159,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) @@ -159,6 +159,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
159 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) 159 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
160 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) 160 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
161 161
  162 +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"libv3270-$app_vrs_major.$app_vrs_minor",[The gettext package name.])
  163 +AC_SUBST(GETTEXT_PACKAGE,"libv3270-$app_vrs_major.$app_vrs_minor")
  164 +
162 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) 165 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
163 166
164 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 167 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
locale/Makefile.in
  Diff comments   View file @91b6521
@@ -33,6 +33,7 @@ datarootdir=@datarootdir@ @@ -33,6 +33,7 @@ datarootdir=@datarootdir@
33 localedir=${datarootdir}/locale 33 localedir=${datarootdir}/locale
34 34
35 PACKAGE_NAME=@PACKAGE_NAME@ 35 PACKAGE_NAME=@PACKAGE_NAME@
  36 +GETTEXT_PACKAGE=@GETTEXT_PACKAGE@
36 PACKAGE_VERSION=@PACKAGE_VERSION@ 37 PACKAGE_VERSION=@PACKAGE_VERSION@
37 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 38 PACKAGE_TARNAME=@PACKAGE_TARNAME@
38 PRODUCT_NAME=@PRODUCT_NAME@ 39 PRODUCT_NAME=@PRODUCT_NAME@
@@ -50,21 +51,21 @@ INSTALL_DATA=@INSTALL_DATA@ @@ -50,21 +51,21 @@ INSTALL_DATA=@INSTALL_DATA@
50 #---[ Rules ]---------------------------------------------------------------------------- 51 #---[ Rules ]----------------------------------------------------------------------------
51 52
52 %.po: \ 53 %.po: \
53 - $(PACKAGE_NAME).pot 54 + $(GETTEXT_PACKAGE).pot
54 55
55 @echo $(basename $@) ... 56 @echo $(basename $@) ...
56 - @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot 57 + @$(MSGMERGE) --update --sort-output $@ $(GETTEXT_PACKAGE).pot
57 @touch $@ 58 @touch $@
58 59
59 -$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ 60 +$(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \
60 %.po 61 %.po
61 62
62 @echo $< ... 63 @echo $< ...
63 @$(MKDIR) `dirname $@` 64 @$(MKDIR) `dirname $@`
64 @$(MSGFMT) -c -v -o $@ $^ 65 @$(MSGFMT) -c -v -o $@ $^
65 66
66 -$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \  
67 - $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo 67 +$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \
  68 + $(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo
68 69
69 @echo $< ... 70 @echo $< ...
70 @$(MKDIR) `dirname $@` 71 @$(MKDIR) `dirname $@`
@@ -73,10 +74,10 @@ $(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ @@ -73,10 +74,10 @@ $(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
73 #---[ Targets ]-------------------------------------------------------------------------- 74 #---[ Targets ]--------------------------------------------------------------------------
74 75
75 all: \ 76 all: \
76 - $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 77 + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo)
77 78
78 install: \ 79 install: \
79 - $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 80 + $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo)
80 81
81 82
82 83
src/dialogs/security.c
  Diff comments   View file @91b6521
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 #include <config.h> 30 #include <config.h>
31 31
32 #define ENABLE_NLS 32 #define ENABLE_NLS
33 - #define GETTEXT_PACKAGE PACKAGE_NAME  
34 33
35 #include <gtk/gtk.h> 34 #include <gtk/gtk.h>
36 #include <libintl.h> 35 #include <libintl.h>
src/filetransfer/private.h
  Diff comments   View file @91b6521
@@ -35,7 +35,6 @@ @@ -35,7 +35,6 @@
35 #include <config.h> 35 #include <config.h>
36 36
37 #define ENABLE_NLS 37 #define ENABLE_NLS
38 - #define GETTEXT_PACKAGE PACKAGE_NAME  
39 38
40 #include <libintl.h> 39 #include <libintl.h>
41 #include <glib/gi18n-lib.h> 40 #include <glib/gi18n-lib.h>
src/include/config.h.in
  Diff comments   View file @91b6521
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 #undef PACKAGE_VERSION 35 #undef PACKAGE_VERSION
36 #undef PACKAGE_RELEASE 36 #undef PACKAGE_RELEASE
37 #undef PRODUCT_NAME 37 #undef PRODUCT_NAME
  38 + #undef GETTEXT_PACKAGE
38 39
39 #undef HAVE_LIBM 40 #undef HAVE_LIBM
40 41
src/include/internals.h
  Diff comments   View file @91b6521
@@ -34,7 +34,6 @@ @@ -34,7 +34,6 @@
34 #include <config.h> 34 #include <config.h>
35 35
36 #define ENABLE_NLS 36 #define ENABLE_NLS
37 - #define GETTEXT_PACKAGE PACKAGE_NAME  
38 37
39 #include <glib.h> 38 #include <glib.h>
40 #include <glib/gi18n-lib.h> 39 #include <glib/gi18n-lib.h>
src/terminal/accessible.c
  Diff comments   View file @91b6521
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 #include <config.h> 30 #include <config.h>
31 31
32 #define ENABLE_NLS 32 #define ENABLE_NLS
33 - #define GETTEXT_PACKAGE PACKAGE_NAME  
34 33
35 #include <gtk/gtk.h> 34 #include <gtk/gtk.h>
36 #include <libintl.h> 35 #include <libintl.h>
src/terminal/drawing/oia.c
  Diff comments   View file @91b6521
@@ -35,7 +35,6 @@ @@ -35,7 +35,6 @@
35 #endif // WIN32 35 #endif // WIN32
36 36
37 #define ENABLE_NLS 37 #define ENABLE_NLS
38 - #define GETTEXT_PACKAGE PACKAGE_NAME  
39 38
40 #include <gtk/gtk.h> 39 #include <gtk/gtk.h>
41 #include <libintl.h> 40 #include <libintl.h>
src/terminal/security.c
  Diff comments   View file @91b6521
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 #include <config.h> 30 #include <config.h>
31 31
32 #define ENABLE_NLS 32 #define ENABLE_NLS
33 - #define GETTEXT_PACKAGE PACKAGE_NAME  
34 33
35 #include <gtk/gtk.h> 34 #include <gtk/gtk.h>
36 #include <libintl.h> 35 #include <libintl.h>
src/trace/private.h
  Diff comments   View file @91b6521
@@ -34,7 +34,6 @@ @@ -34,7 +34,6 @@
34 #include <gtk/gtk.h> 34 #include <gtk/gtk.h>
35 35
36 #define ENABLE_NLS 36 #define ENABLE_NLS
37 - #define GETTEXT_PACKAGE PACKAGE_NAME  
38 37
39 #include <libintl.h> 38 #include <libintl.h>
40 #include <glib/gi18n-lib.h> 39 #include <glib/gi18n-lib.h>
src/trace/tracewindow.c
  Diff comments   View file @91b6521
@@ -36,10 +36,10 @@ @@ -36,10 +36,10 @@
36 * 36 *
37 */ 37 */
38 38
  39 + #include <config.h>
39 #include <gtk/gtk.h> 40 #include <gtk/gtk.h>
40 41
41 #define ENABLE_NLS 42 #define ENABLE_NLS
42 - #define GETTEXT_PACKAGE PACKAGE_NAME  
43 43
44 #include <libintl.h> 44 #include <libintl.h>
45 #include <glib/gi18n-lib.h> 45 #include <glib/gi18n-lib.h>