diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-09-22 16:56:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-09-22 16:56:34 +0200 |
| commit | 9a2902305b75a6bc5a288fd1b12323c77df09b8c (patch) | |
| tree | c2bea1b536793a02e558a0c222542f9aa23736bc | |
| parent | 61e927785a8b79141cb5aac622cb00b547b78b9b (diff) | |
Use --add-location=file for po/ and doc/po
This avoids churn in the po/pot files when just the location line
number in the source code changes.
Git-Dch: ignore
| -rw-r--r-- | doc/makefile | 4 | ||||
| -rw-r--r-- | po/makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/makefile b/doc/makefile index 1c076d5be..1f009b0f5 100644 --- a/doc/makefile +++ b/doc/makefile @@ -61,12 +61,15 @@ po4a: manpages/subdirs docbook/subdirs update-po: po4a --previous --no-backups --force --no-translations \ + --msgmerge-opt --add-location=file \ + --porefs noline,wrap \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf manpages/subdirs: $(MANPAGEPOLIST) $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + --msgmerge-opt --add-location=file \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \ @@ -81,6 +84,7 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf docbook/subdirs: $(DOCBOOKPOLIST) $(DOCBOOKPOLIST) :: docbook-translation-% : %/makefile po4a.conf po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + --msgmerge-opt --add-location=file \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.dbk,%.$(subst /,,$(dir $<)).dbk,$(wildcard *.dbk))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf diff --git a/po/makefile b/po/makefile index 58fd3c2ce..f42d476a3 100644 --- a/po/makefile +++ b/po/makefile @@ -40,7 +40,7 @@ $(POTFILES) : $(PO)/%.pot : cat $(PO)/domains/$*/*.srclist | sort > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ - --no-location \ + --add-location=file \ --keyword=P_:1,2 \ --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \ @@ -59,7 +59,7 @@ $(POTFILES) : $(PO)/%.pot : $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(POTFILES) printf "%s " "Generating $@" echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d - $(MSGMERGE) --no-location $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ + $(MSGMERGE) --add-location=file $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo" |