Commit 91b6521886b9578f9851a82a06b48218617395b8
1 parent
9c57e1f3
Exists in
master
and in
1 other branch
Fixing translation file conflicts.
Showing
11 changed files
with
13 additions
and
15 deletions
Show diff stats
configure.ac
| ... | ... | @@ -159,6 +159,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) |
| 159 | 159 | AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) |
| 160 | 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 | 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 | 167 | app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) | ... | ... |
locale/Makefile.in
| ... | ... | @@ -33,6 +33,7 @@ datarootdir=@datarootdir@ |
| 33 | 33 | localedir=${datarootdir}/locale |
| 34 | 34 | |
| 35 | 35 | PACKAGE_NAME=@PACKAGE_NAME@ |
| 36 | +GETTEXT_PACKAGE=@GETTEXT_PACKAGE@ | |
| 36 | 37 | PACKAGE_VERSION=@PACKAGE_VERSION@ |
| 37 | 38 | PACKAGE_TARNAME=@PACKAGE_TARNAME@ |
| 38 | 39 | PRODUCT_NAME=@PRODUCT_NAME@ |
| ... | ... | @@ -50,21 +51,21 @@ INSTALL_DATA=@INSTALL_DATA@ |
| 50 | 51 | #---[ Rules ]---------------------------------------------------------------------------- |
| 51 | 52 | |
| 52 | 53 | %.po: \ |
| 53 | - $(PACKAGE_NAME).pot | |
| 54 | + $(GETTEXT_PACKAGE).pot | |
| 54 | 55 | |
| 55 | 56 | @echo $(basename $@) ... |
| 56 | - @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot | |
| 57 | + @$(MSGMERGE) --update --sort-output $@ $(GETTEXT_PACKAGE).pot | |
| 57 | 58 | @touch $@ |
| 58 | 59 | |
| 59 | -$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ | |
| 60 | +$(BINDIR)/%/LC_MESSAGES/$(GETTEXT_PACKAGE).mo: \ | |
| 60 | 61 | %.po |
| 61 | 62 | |
| 62 | 63 | @echo $< ... |
| 63 | 64 | @$(MKDIR) `dirname $@` |
| 64 | 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 | 70 | @echo $< ... |
| 70 | 71 | @$(MKDIR) `dirname $@` |
| ... | ... | @@ -73,10 +74,10 @@ $(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ |
| 73 | 74 | #---[ Targets ]-------------------------------------------------------------------------- |
| 74 | 75 | |
| 75 | 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 | 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
src/filetransfer/private.h
src/include/config.h.in
src/include/internals.h
src/terminal/accessible.c
src/terminal/drawing/oia.c
src/terminal/security.c
src/trace/private.h
src/trace/tracewindow.c