Merge branch 'js/i18n-no-location'

* js/i18n-no-location:
  gitk: commit translation files without file information

Makefile

@@ -70,7 +70,10 @@ gitk-wish: gitk GIT-TCLTK-VARS
 $(PO_TEMPLATE): gitk
 	$(XGETTEXT) -kmc -LTcl -o $@ gitk
 update-po:: $(PO_TEMPLATE)
-	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
+	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U --add-location $p $(PO_TEMPLATE) ; )
+	@echo "Before committing changes, ensure that a clean-filter is installed:"; \
+	echo; \
+	echo "	git config filter.gettext-no-location.clean \"msgcat --no-location -\""
 $(ALL_MSGFILES): %.msg : %.po
 	@echo Generating catalog $@
 	$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<

po/.gitattributes

@@ -0,0 +1 @@
+/*.po    filter=gettext-no-location