Imported Debian patch 4.7.2-3

po/LINGUAS

@@ -1 +1,23 @@
-bn_IN ca cs de en_GB es eu fr hi hu id ja kn mr nl pa pl pt pt_BR ru sk tg uk zh_CN
+bn_IN   # Bengali (India)
+ca      # Catalan
+cs      # Czech
+de      # German
+en_GB   # English (United Kingdom)
+es      # Spanish
+eu      # Basque
+fr      # French
+hi      # Hindi
+hu      # Hungarian
+id      # Indonesian
+ja      # Japanese
+kn      # Kannada
+mr      # Marathi
+nl      # Dutch
+pa      # Punjabi
+pl      # Polish
+pt_BR   # Portuguese (Brazil)
+ru      # Russian
+sk      # Slovak
+tg      # Tajik
+uk      # Ukrainian
+zh_CN   # Chinese (China)

po/Makefile.hack.in

@@ -7,32 +7,12 @@ DISTFILES.common.extra3 = Makefile.hack.in
 IPA_TEST_I18N = @top_srcdir@/ipatests/i18n.py
 MSGATTRIB = @MSGATTRIB@
 PYTHON = @PYTHON@
-GIT_BRANCH = @GIT_BRANCH@
 
-# Don't use strip-po[t] as a dependency, https://pagure.io/freeipa/issue/8323
-.PHONY: strip-po strip-pot
-strip-pot: $(DOMAIN).pot
-	grep -v '#: ipaclient/remote_plugins/' $(DOMAIN).pot > $(DOMAIN).pot.tmp
-	mv $(DOMAIN).pot.tmp $(DOMAIN).pot
-	if [ "$(GIT_BRANCH)" != "" ]; then \
-		export GIT_DIFF_IPA_POT=`git diff --numstat $(DOMAIN).pot | cut -f1,2 | tr '\t' ,` || :; \
-		if [ "$$GIT_DIFF_IPA_POT" = "2,2" -o "$$GIT_DIFF_IPA_POT" = "1,1" ]; then \
-			echo "No changes in $(DOMAIN).pot, restore the original"; \
-			git checkout -q -f $(DOMAIN).pot; \
-		fi; \
-	fi
-
-strip-po: stamp-po
+.PHONY: strip-po
+strip-po:
 	for po_file in $(POFILES); do \
 		$(MSGATTRIB) --translated --no-fuzzy --no-location -s $$po_file > $$po_file.tmp || exit 1; \
 		mv $$po_file.tmp $$po_file || exit 1; \
-		if [ "$(GIT_BRANCH)" != "" ]; then \
-			export GIT_DIFF_PO_FILE=`git diff --numstat $$po_file | cut -f1,2 | tr '\t' ,` || :; \
-			if [ "$$GIT_DIFF_PO_FILE" = "2,2" -o "$$GIT_DIFF_PO_FILE" = "1,1" ]; then \
-				echo "No translation changes in $$po_file, restore the original"; \
-				git checkout -q -f $$po_file; \
-			fi; \
-		fi; \
 	done
 	export FILES_TO_REMOVE=`find $(srcdir) -name '*.po' -empty` || exit 1; \
 	if [ "$$FILES_TO_REMOVE" != "" ]; then \
@@ -41,26 +21,18 @@ strip-po: stamp-po
 	fi
 
 clean: mostlyclean
-	rm -rf test_locale
-	rm -f *~ *.tmp test.po
-
-all: $(DOMAIN).pot
-	$(MAKE) strip-pot strip-po
+	rm -f *~
 
 # linters
 test-gettext: $(DOMAIN).pot
-	$(MAKE) strip-pot
 	$(PYTHON) $(IPA_TEST_I18N) --test-gettext
 
 validate-pot: $(DOMAIN).pot
-	$(MAKE) strip-pot
-	$(PYTHON) $(IPA_TEST_I18N) --show-strings --validate-pot $<
+	$(PYTHON) $(IPA_TEST_I18N) --show-strings --validate-pot $(DOMAIN).pot
 
-validate-po: stamp-po
-	$(MAKE) strip-po
+validate-po: $(DOMAIN).pot
 	$(PYTHON) $(IPA_TEST_I18N) --show-strings --validate-po $(POFILES)
 
 # forcefully re-generate .pot file and test it
 validate-src-strings: $(DOMAIN).pot-update
-	$(MAKE) strip-pot
 	$(MAKE) validate-pot

po/Makevars

@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --from-code="UTF-8" --keyword=_
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = FreeIPA Contributors
+COPYRIGHT_HOLDER = Red Hat
 
 # This tells whether or not to prepend "GNU " prefix to the package
 # name that gets inserted into the header of the $(DOMAIN).pot file.
@@ -41,7 +41,7 @@ PACKAGE_GNU = no
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://pagure.io/freeipa/new_issue
+MSGID_BUGS_ADDRESS = https://fedorahosted.org/freeipa/newticket
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.