New upstream version 4.1upstream/4.1

2 files changed, 100 insertions, 32 deletions

diff --git a/iso_3166-3/Makefile.in b/iso_3166-3/Makefile.in
index 3d6ae8ab..f309e33e 100644
--- a/iso_3166-3/Makefile.in
+++ b/iso_3166-3/Makefile.in
@@ -114,7 +114,35 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(noinst_DATA)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(xmldir)"
+DATA = $(nodist_xml_DATA) $(noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/common.mk
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -202,15 +230,18 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DOMAIN = iso_3166-3
+xmldir = $(datadir)/xml/iso-codes
+nodist_xml_DATA = $(DOMAIN).xml
 pofiles = $(wildcard $(srcdir)/*.po)
 mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
-noinst_DATA = $(mofiles)
+noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
 EXTRA_DIST = \
 	$(pofiles)	\
 	$(DOMAIN).pot
 
 MOSTLYCLEANFILES = \
-	$(mofiles)
+	$(mofiles) \
+	$(DOMAIN).xml
 
 all: all-am
 
@@ -245,6 +276,27 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-nodist_xmlDATA: $(nodist_xml_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(nodist_xml_DATA)'; test -n "$(xmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(xmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(xmldir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xmldir)" || exit $$?; \
+	done
+
+uninstall-nodist_xmlDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_xml_DATA)'; test -n "$(xmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(xmldir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -287,6 +339,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(xmldir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -338,7 +393,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-nodist_xmlDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -383,7 +438,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-nodist_xmlDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: check-am install-am install-data-am install-strip uninstall-am
@@ -394,11 +449,11 @@ uninstall-am:
 	install-data install-data-am install-data-hook install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-hook
+	install-nodist_xmlDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
+	uninstall uninstall-am uninstall-hook uninstall-nodist_xmlDATA
 
 .PRECIOUS: Makefile
 
@@ -420,6 +475,10 @@ $(DOMAIN).pot: $(top_srcdir)/bin/pot_from_json.py $(top_srcdir)/data/$(DOMAIN).j
 		rm -f $(DOMAIN).1po $(DOMAIN).2po backup.pot; \
 	fi
 
+# Generic target to create deprecated .xml files from JSON data files
+$(DOMAIN).xml: $(top_srcdir)/bin/xml_from_json.py $(top_srcdir)/data/$(DOMAIN).json
+	python3 $(top_srcdir)/bin/xml_from_json.py $(DOMAIN) $(top_srcdir)/data $@
+
 # Used in the domain subdirectories for checking that
 # all .po files contain UTF-8 data
 check-local:
@@ -472,6 +531,11 @@ install-data-hook: $(mofiles)
 		if [ "$(DOMAIN)" = "iso_3166-1" ]; then (cd $$dir && $(LN_S) $(DOMAIN).mo iso_3166.mo); fi; \
 		if [ "$(DOMAIN)" = "iso_3166-2" ]; then (cd $$dir && $(LN_S) $(DOMAIN).mo iso_3166_2.mo); fi; \
 	done
+	if [ "$(DOMAIN)" = "iso_639-2" ]; then (cd $(DESTDIR)$(xmldir) && $(LN_S) $(DOMAIN).xml iso_639.xml); fi
+	if [ "$(DOMAIN)" = "iso_639-3" ]; then (cd $(DESTDIR)$(xmldir) && $(LN_S) $(DOMAIN).xml iso_639_3.xml); fi
+	if [ "$(DOMAIN)" = "iso_639-5" ]; then (cd $(DESTDIR)$(xmldir) && $(LN_S) $(DOMAIN).xml iso_639_5.xml); fi
+	if [ "$(DOMAIN)" = "iso_3166-1" ]; then (cd $(DESTDIR)$(xmldir) && $(LN_S) $(DOMAIN).xml iso_3166.xml); fi
+	if [ "$(DOMAIN)" = "iso_3166-2" ]; then (cd $(DESTDIR)$(xmldir) && $(LN_S) $(DOMAIN).xml iso_3166_2.xml); fi
 
 uninstall-hook:
 	catalogs='$(mofiles)'; \
@@ -485,6 +549,11 @@ uninstall-hook:
 		if [ "$(DOMAIN)" = "iso_3166-1" ]; then rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/iso_3166.mo; fi; \
 		if [ "$(DOMAIN)" = "iso_3166-1" ]; then rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/iso_3166_2.mo; fi; \
 	done
+	if [ "$(DOMAIN)" = "iso_639-2" ]; then rm -f $(DESTDIR)$(xmldir)/iso_639.xml; fi
+	if [ "$(DOMAIN)" = "iso_639-3" ]; then rm -f $(DESTDIR)$(xmldir)/iso_639_3.xml; fi
+	if [ "$(DOMAIN)" = "iso_639-5" ]; then rm -f $(DESTDIR)$(xmldir)/iso_639_5.xml; fi
+	if [ "$(DOMAIN)" = "iso_3166-1" ]; then rm -f $(DESTDIR)$(xmldir)/iso_3166.xml; fi
+	if [ "$(DOMAIN)" = "iso_3166-2" ]; then rm -f $(DESTDIR)$(xmldir)/iso_3166_2.xml; fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/iso_3166-3/it.po b/iso_3166-3/it.po
index afb766cc..2d9094b3 100644
--- a/iso_3166-3/it.po
+++ b/iso_3166-3/it.po
@@ -16,19 +16,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://salsa.debian.org/iso-codes-team/iso-codes/"
 "issues\n"
 "POT-Creation-Date: 2018-01-17 22:10+0100\n"
-"PO-Revision-Date: 2015-07-12 19:48+0200\n"
-"Last-Translator: Milo Casagrande <milo@milo.name>\n"
+"PO-Revision-Date: 2018-09-03 20:54+0200\n"
+"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.8.2\n"
+"X-Generator: Poedit 2.1.1\n"
 
 #. Name for AIDJ
 msgid "French Afars and Issas"
-msgstr "Afars e Issas francesi"
+msgstr "Territorio francese degli Afar e degli Issa"
 
 #. Name for ANHH
 msgid "Netherlands Antilles"
@@ -36,19 +36,19 @@ msgstr "Antille olandesi"
 
 #. Name for BQAQ
 msgid "British Antarctic Territory"
-msgstr "Territorio britannico antartico"
+msgstr "Territorio antartico britannico"
 
 #. Name for BUMM
 msgid "Burma, Socialist Republic of the Union of"
-msgstr "Repubblica socialista dell'unione della Birmania"
+msgstr "Birmania, Repubblica Socialista dell'Unione della"
 
 #. Name for BYAA
 msgid "Byelorussian SSR Soviet Socialist Republic"
-msgstr "Repubblica socialista sovietica bielorussa"
+msgstr "Repubblica Socialista Sovietica Bielorussa"
 
 #. Name for CSHH
 msgid "Czechoslovakia, Czechoslovak Socialist Republic"
-msgstr "Cecoslovacchia, Repubblica socialista cecoslovacca"
+msgstr "Cecoslovacchia, Repubblica Socialista Cecoslovacca"
 
 #. Name for CSXX
 msgid "Serbia and Montenegro"
@@ -60,7 +60,7 @@ msgstr "Isole Canton ed Enderbury"
 
 #. Name for DDDE
 msgid "German Democratic Republic"
-msgstr "Repubblica democratica tedesca"
+msgstr "Repubblica Democratica Tedesca"
 
 #. Name for DYBJ
 msgid "Dahomey"
@@ -68,7 +68,7 @@ msgstr "Dahomey"
 
 #. Name for FQHH
 msgid "French Southern and Antarctic Territories"
-msgstr "Territori meridionali e antartici francesi"
+msgstr "Terre australi e antartiche francesi"
 
 # (ndt) da wikipedia
 #. Name for FXFR
@@ -81,15 +81,15 @@ msgstr "Isole Gilbert ed Ellice"
 
 #. Name for HVBF
 msgid "Upper Volta, Republic of"
-msgstr "Repubblica del Volta superiore"
+msgstr "Alto Volta, Repubblica del"
 
 #. Name for JTUM
 msgid "Johnston Island"
-msgstr "Johnston Island"
+msgstr "Atollo Johnston"
 
 #. Name for MIUM
 msgid "Midway Islands"
-msgstr "Isole Midway"
+msgstr "Atollo di Midway"
 
 #. Name for NHVU
 msgid "New Hebrides"
@@ -97,7 +97,7 @@ msgstr "Nuove Ebridi"
 
 #. Name for NQAQ
 msgid "Dronning Maud Land"
-msgstr "Terra della regina di Maud"
+msgstr "Terra della regina Maud"
 
 #. Name for NTHH
 msgid "Neutral Zone"
@@ -106,12 +106,11 @@ msgstr "Zona neutrale"
 # da wikipedia
 #. Name for PCHH
 msgid "Pacific Islands (trust territory)"
-msgstr "Territorio in amministrazione fiduciaria delle isole del Pacifico"
+msgstr "Territorio fiduciario delle Isole del Pacifico"
 
-# (ndt) non riesco a trovare una traduzione
 #. Name for PUUM
 msgid "US Miscellaneous Pacific Islands"
-msgstr "US Miscellaneous Pacific Islands"
+msgstr "Altre isole del Pacifico (USA)"
 
 #. Name for PZPA
 msgid "Panama Canal Zone"
@@ -135,20 +134,20 @@ msgstr "Timor Est"
 
 #. Name for VDVN
 msgid "Viet-Nam, Democratic Republic of"
-msgstr "Repubblica democratica del Vietnam"
+msgstr "Vietnam, Repubblica democratica del"
 
 #. Name for WKUM
 msgid "Wake Island"
-msgstr "Isola Wake"
+msgstr "Atollo di Wake"
 
 #. Name for YDYE
 msgid "Yemen, Democratic, People's Democratic Republic of"
-msgstr "Repubblica democratica popolare dello Yemen"
+msgstr "Yemen, Repubblica Democratica Popolare dello"
 
 #. Name for YUCS
 msgid "Yugoslavia, Socialist Federal Republic of"
-msgstr "Repubblica socialista federale di Yugoslavia"
+msgstr "Jugoslavia, Repubblica Socialista Federale di"
 
 #. Name for ZRCD
 msgid "Zaire, Republic of"
-msgstr "Repubblica dello Zaire"
+msgstr "Zaire, Repubblica dello"