- Update to 2.4.0

- Enable stage support

3 files changed, 856 insertions, 54 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 535d0c7c6729..8a175d47a608 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeciv
-PORTVERSION=	2.3.4
+PORTVERSION=	2.4.0
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
 
@@ -17,16 +17,13 @@ USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --program-transform-name=
-
-MAN6=		freeciv-server.6 freeciv-client.6 \
-		freeciv-xaw.6 freeciv-sdl.6 freeciv-gtk2.6 \
-		freeciv-manual.6 freeciv-modpack.6
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --program-transform-name= \
+		--enable-aimodules --enable-shared \
+		--enable-fcdb=sqlite3
 
 OPTIONS_DEFINE?=	X11 SDL MYSQL IPV6
-OPTIONS_DEFAULT?=	X11 MYSQL IPV6
+OPTIONS_DEFAULT?=	X11 IPV6
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSDL} && empty(PORT_OPTIONS:MX11)
@@ -34,15 +31,16 @@ IGNORE=		cannot use SDL without X11: re-run make config
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff \
-		png15:${PORTSDIR}/graphics/png \
-		ggz:${PORTSDIR}/games/libggz \
-		ggz-gtk:${PORTSDIR}/games/ggz-gtk-client \
-		ggzcore:${PORTSDIR}/games/ggz-client-libs \
-		ggzmod:${PORTSDIR}/games/ggz-client-libs
+LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libggz.so:${PORTSDIR}/games/libggz \
+		libggz-gtk.so:${PORTSDIR}/games/ggz-gtk-client \
+		libggzcore.so:${PORTSDIR}/games/ggz-client-libs \
+		libggzmod.so:${PORTSDIR}/games/ggz-client-libs
 USE_XORG=	xpm
 USE_SDL=	mixer
 USE_GNOME=	gtk20
+USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS+=--enable-client=gtk
 CONFLICTS=	freeciv-nox11-[0-9]*
@@ -62,7 +60,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=--enable-auth --with-mysql-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-fcdb=mysql --with-mysql-prefix=${LOCALBASE}
 USE_MYSQL=	yes
 .endif
 
@@ -79,13 +77,13 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e\
-		'/pkgdatadir/s|$$[(]datadir[)]/@PACKAGE@|${DATADIR}|'
+	@${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e \
+		'/pkgdatadir/s|[(]datadir)/@PACKAGE@|(prefix)/${DATADIR_REL}|'
 
 .if ${PORT_OPTIONS:MX11}
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${DATADIR}/
-	@cd ${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
+	@${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}/${DATADIR}/
+	@cd ${STAGEDIR}/${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index dd751dae7c26..f6c5b1ad6dc3 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.3.4.tar.bz2) = 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c
-SIZE (freeciv-2.3.4.tar.bz2) = 31395893
+SHA256 (freeciv-2.4.0.tar.bz2) = 7b2a9e6f777d2ac62bad9378dd7d03e4be07527c89d892b8f12b6b18fd0d80ad
+SIZE (freeciv-2.4.0.tar.bz2) = 38221472
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 77b0c182d321..770b98d6dc1c 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,15 +1,30 @@
 bin/freeciv-server
+bin/freeciv-modpack
 %%X11%%bin/freeciv-client
 %%X11%%bin/freeciv-manual
-%%X11%%bin/freeciv-modpack
 %%GTK%%bin/freeciv-gtk2
 %%SDL%%bin/freeciv-sdl
-lib/libfreeciv.a
-lib/libfreeciv.la
+etc/freeciv/database.lua
+etc/ggz.modules
 lib/libfreeciv-srv.a
 lib/libfreeciv-srv.la
+lib/libfreeciv-srv.so
+lib/libfreeciv-srv.so.0
+lib/libfreeciv.a
+lib/libfreeciv.la
+lib/libfreeciv.so
+lib/libfreeciv.so.0
+man/man6/freeciv-client.6.gz
+man/man6/freeciv-gtk2.6.gz
+man/man6/freeciv-gtk3.6.gz
+man/man6/freeciv-manual.6.gz
+man/man6/freeciv-modpack.6.gz
+man/man6/freeciv-qt.6.gz
+man/man6/freeciv-sdl.6.gz
+man/man6/freeciv-server.6.gz
+man/man6/freeciv-xaw.6.gz
 share/applications/freeciv-server.desktop
-%%X11%%share/applications/freeciv-modpack.desktop
+share/applications/freeciv-modpack.desktop
 %%X11%%share/applications/freeciv.desktop
 %%X11%%%%DATADIR%%/amplio2/ancientcities.png
 %%X11%%%%DATADIR%%/amplio2/ancientcities.spec
@@ -42,6 +57,8 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/amplio2/tiles.spec
 %%X11%%%%DATADIR%%/amplio2/units.png
 %%X11%%%%DATADIR%%/amplio2/units.spec
+%%X11%%%%DATADIR%%/amplio2/veterancy.png
+%%X11%%%%DATADIR%%/amplio2/veterancy.spec
 %%X11%%%%DATADIR%%/amplio2/water.png
 %%X11%%%%DATADIR%%/amplio2/water.spec
 %%X11%%%%DATADIR%%/amplio2.tilespec
@@ -85,6 +102,9 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/buildings/supermarket.png
 %%X11%%%%DATADIR%%/buildings/temple.png
 %%X11%%%%DATADIR%%/buildings/university.png
+%%X11%%%%DATADIR%%/cimpletoon.tilespec
+%%X11%%%%DATADIR%%/cimpletoon/orient_units.png
+%%X11%%%%DATADIR%%/cimpletoon/orient_units.spec
 %%DATADIR%%/civ1/buildings.ruleset
 %%DATADIR%%/civ1/cities.ruleset
 %%DATADIR%%/civ1/effects.ruleset
@@ -127,9 +147,9 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/experimental/buildings.ruleset
 %%DATADIR%%/experimental/cities.ruleset
 %%DATADIR%%/experimental/effects.ruleset
-%%DATADIR%%/experimental/script.lua
 %%DATADIR%%/experimental/game.ruleset
 %%DATADIR%%/experimental/governments.ruleset
+%%DATADIR%%/experimental/script.lua
 %%DATADIR%%/experimental/techs.ruleset
 %%DATADIR%%/experimental/terrain.ruleset
 %%DATADIR%%/experimental/units.ruleset
@@ -150,10 +170,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/aceh-shield-large.png
 %%X11%%%%DATADIR%%/flags/aceh-shield.png
 %%X11%%%%DATADIR%%/flags/aceh.png
+%%X11%%%%DATADIR%%/flags/acre-large.png
+%%X11%%%%DATADIR%%/flags/acre-shield-large.png
+%%X11%%%%DATADIR%%/flags/acre-shield.png
+%%X11%%%%DATADIR%%/flags/acre.png
+%%X11%%%%DATADIR%%/flags/adygea-large.png
+%%X11%%%%DATADIR%%/flags/adygea-shield-large.png
+%%X11%%%%DATADIR%%/flags/adygea-shield.png
+%%X11%%%%DATADIR%%/flags/adygea.png
 %%X11%%%%DATADIR%%/flags/afghanistan-large.png
 %%X11%%%%DATADIR%%/flags/afghanistan-shield-large.png
 %%X11%%%%DATADIR%%/flags/afghanistan-shield.png
 %%X11%%%%DATADIR%%/flags/afghanistan.png
+%%X11%%%%DATADIR%%/flags/africa-large.png
+%%X11%%%%DATADIR%%/flags/africa-shield-large.png
+%%X11%%%%DATADIR%%/flags/africa-shield.png
+%%X11%%%%DATADIR%%/flags/africa.png
 %%X11%%%%DATADIR%%/flags/ainu-large.png
 %%X11%%%%DATADIR%%/flags/ainu-shield-large.png
 %%X11%%%%DATADIR%%/flags/ainu-shield.png
@@ -162,6 +194,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/akwe-shield-large.png
 %%X11%%%%DATADIR%%/flags/akwe-shield.png
 %%X11%%%%DATADIR%%/flags/akwe.png
+%%X11%%%%DATADIR%%/flags/aland-large.png
+%%X11%%%%DATADIR%%/flags/aland-shield-large.png
+%%X11%%%%DATADIR%%/flags/aland-shield.png
+%%X11%%%%DATADIR%%/flags/aland.png
 %%X11%%%%DATADIR%%/flags/albania-large.png
 %%X11%%%%DATADIR%%/flags/albania-shield-large.png
 %%X11%%%%DATADIR%%/flags/albania-shield.png
@@ -178,6 +214,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/almohad-shield-large.png
 %%X11%%%%DATADIR%%/flags/almohad-shield.png
 %%X11%%%%DATADIR%%/flags/almohad.png
+%%X11%%%%DATADIR%%/flags/alsace-large.png
+%%X11%%%%DATADIR%%/flags/alsace-shield-large.png
+%%X11%%%%DATADIR%%/flags/alsace-shield.png
+%%X11%%%%DATADIR%%/flags/alsace.png
 %%X11%%%%DATADIR%%/flags/amazigh-large.png
 %%X11%%%%DATADIR%%/flags/amazigh-shield-large.png
 %%X11%%%%DATADIR%%/flags/amazigh-shield.png
@@ -194,6 +234,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/angola-shield-large.png
 %%X11%%%%DATADIR%%/flags/angola-shield.png
 %%X11%%%%DATADIR%%/flags/angola.png
+%%X11%%%%DATADIR%%/flags/anhalt-large.png
+%%X11%%%%DATADIR%%/flags/anhalt-shield-large.png
+%%X11%%%%DATADIR%%/flags/anhalt-shield.png
+%%X11%%%%DATADIR%%/flags/anhalt.png
 %%X11%%%%DATADIR%%/flags/anishinaabe-large.png
 %%X11%%%%DATADIR%%/flags/anishinaabe-shield-large.png
 %%X11%%%%DATADIR%%/flags/anishinaabe-shield.png
@@ -206,6 +250,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/antarctica_alt-shield-large.png
 %%X11%%%%DATADIR%%/flags/antarctica_alt-shield.png
 %%X11%%%%DATADIR%%/flags/antarctica_alt.png
+%%X11%%%%DATADIR%%/flags/antigua_and_barbuda-large.png
+%%X11%%%%DATADIR%%/flags/antigua_and_barbuda-shield-large.png
+%%X11%%%%DATADIR%%/flags/antigua_and_barbuda-shield.png
+%%X11%%%%DATADIR%%/flags/antigua_and_barbuda.png
 %%X11%%%%DATADIR%%/flags/apache-large.png
 %%X11%%%%DATADIR%%/flags/apache-shield-large.png
 %%X11%%%%DATADIR%%/flags/apache-shield.png
@@ -234,6 +282,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/ashanti-shield-large.png
 %%X11%%%%DATADIR%%/flags/ashanti-shield.png
 %%X11%%%%DATADIR%%/flags/ashanti.png
+%%X11%%%%DATADIR%%/flags/assam-large.png
+%%X11%%%%DATADIR%%/flags/assam-shield-large.png
+%%X11%%%%DATADIR%%/flags/assam-shield.png
+%%X11%%%%DATADIR%%/flags/assam.png
 %%X11%%%%DATADIR%%/flags/assyria-large.png
 %%X11%%%%DATADIR%%/flags/assyria-shield-large.png
 %%X11%%%%DATADIR%%/flags/assyria-shield.png
@@ -254,6 +306,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/austria-shield-large.png
 %%X11%%%%DATADIR%%/flags/austria-shield.png
 %%X11%%%%DATADIR%%/flags/austria.png
+%%X11%%%%DATADIR%%/flags/avar-large.png
+%%X11%%%%DATADIR%%/flags/avar-shield-large.png
+%%X11%%%%DATADIR%%/flags/avar-shield.png
+%%X11%%%%DATADIR%%/flags/avar.png
 %%X11%%%%DATADIR%%/flags/aymara-large.png
 %%X11%%%%DATADIR%%/flags/aymara-shield-large.png
 %%X11%%%%DATADIR%%/flags/aymara-shield.png
@@ -274,10 +330,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/baden-shield-large.png
 %%X11%%%%DATADIR%%/flags/baden-shield.png
 %%X11%%%%DATADIR%%/flags/baden.png
+%%X11%%%%DATADIR%%/flags/bahamas-large.png
+%%X11%%%%DATADIR%%/flags/bahamas-shield-large.png
+%%X11%%%%DATADIR%%/flags/bahamas-shield.png
+%%X11%%%%DATADIR%%/flags/bahamas.png
+%%X11%%%%DATADIR%%/flags/bahrain-large.png
+%%X11%%%%DATADIR%%/flags/bahrain-shield-large.png
+%%X11%%%%DATADIR%%/flags/bahrain-shield.png
+%%X11%%%%DATADIR%%/flags/bahrain.png
 %%X11%%%%DATADIR%%/flags/bangladesh-large.png
 %%X11%%%%DATADIR%%/flags/bangladesh-shield-large.png
 %%X11%%%%DATADIR%%/flags/bangladesh-shield.png
 %%X11%%%%DATADIR%%/flags/bangladesh.png
+%%X11%%%%DATADIR%%/flags/barbados-large.png
+%%X11%%%%DATADIR%%/flags/barbados-shield-large.png
+%%X11%%%%DATADIR%%/flags/barbados-shield.png
+%%X11%%%%DATADIR%%/flags/barbados.png
 %%X11%%%%DATADIR%%/flags/barbarian-large.png
 %%X11%%%%DATADIR%%/flags/barbarian-shield-large.png
 %%X11%%%%DATADIR%%/flags/barbarian-shield.png
@@ -294,10 +362,26 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/belarus-shield-large.png
 %%X11%%%%DATADIR%%/flags/belarus-shield.png
 %%X11%%%%DATADIR%%/flags/belarus.png
+%%X11%%%%DATADIR%%/flags/belgic-large.png
+%%X11%%%%DATADIR%%/flags/belgic-shield-large.png
+%%X11%%%%DATADIR%%/flags/belgic-shield.png
+%%X11%%%%DATADIR%%/flags/belgic.png
 %%X11%%%%DATADIR%%/flags/belgium-large.png
 %%X11%%%%DATADIR%%/flags/belgium-shield-large.png
 %%X11%%%%DATADIR%%/flags/belgium-shield.png
 %%X11%%%%DATADIR%%/flags/belgium.png
+%%X11%%%%DATADIR%%/flags/belize-large.png
+%%X11%%%%DATADIR%%/flags/belize-shield-large.png
+%%X11%%%%DATADIR%%/flags/belize-shield.png
+%%X11%%%%DATADIR%%/flags/belize.png
+%%X11%%%%DATADIR%%/flags/bengal-large.png
+%%X11%%%%DATADIR%%/flags/bengal-shield-large.png
+%%X11%%%%DATADIR%%/flags/bengal-shield.png
+%%X11%%%%DATADIR%%/flags/bengal.png
+%%X11%%%%DATADIR%%/flags/benin-large.png
+%%X11%%%%DATADIR%%/flags/benin-shield-large.png
+%%X11%%%%DATADIR%%/flags/benin-shield.png
+%%X11%%%%DATADIR%%/flags/benin.png
 %%X11%%%%DATADIR%%/flags/benin_ancient-large.png
 %%X11%%%%DATADIR%%/flags/benin_ancient-shield-large.png
 %%X11%%%%DATADIR%%/flags/benin_ancient-shield.png
@@ -314,10 +398,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/boer-shield-large.png
 %%X11%%%%DATADIR%%/flags/boer-shield.png
 %%X11%%%%DATADIR%%/flags/boer.png
+%%X11%%%%DATADIR%%/flags/boii-large.png
+%%X11%%%%DATADIR%%/flags/boii-shield-large.png
+%%X11%%%%DATADIR%%/flags/boii-shield.png
+%%X11%%%%DATADIR%%/flags/boii.png
 %%X11%%%%DATADIR%%/flags/bolivia-large.png
 %%X11%%%%DATADIR%%/flags/bolivia-shield-large.png
 %%X11%%%%DATADIR%%/flags/bolivia-shield.png
 %%X11%%%%DATADIR%%/flags/bolivia.png
+%%X11%%%%DATADIR%%/flags/bophuthatswana-large.png
+%%X11%%%%DATADIR%%/flags/bophuthatswana-shield-large.png
+%%X11%%%%DATADIR%%/flags/bophuthatswana-shield.png
+%%X11%%%%DATADIR%%/flags/bophuthatswana.png
 %%X11%%%%DATADIR%%/flags/bosnia-large.png
 %%X11%%%%DATADIR%%/flags/bosnia-shield-large.png
 %%X11%%%%DATADIR%%/flags/bosnia-shield.png
@@ -346,6 +438,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/brittany-shield-large.png
 %%X11%%%%DATADIR%%/flags/brittany-shield.png
 %%X11%%%%DATADIR%%/flags/brittany.png
+%%X11%%%%DATADIR%%/flags/brunei-large.png
+%%X11%%%%DATADIR%%/flags/brunei-shield-large.png
+%%X11%%%%DATADIR%%/flags/brunei-shield.png
+%%X11%%%%DATADIR%%/flags/brunei.png
 %%X11%%%%DATADIR%%/flags/bulgaria-large.png
 %%X11%%%%DATADIR%%/flags/bulgaria-shield-large.png
 %%X11%%%%DATADIR%%/flags/bulgaria-shield.png
@@ -362,6 +458,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/burundi-shield-large.png
 %%X11%%%%DATADIR%%/flags/burundi-shield.png
 %%X11%%%%DATADIR%%/flags/burundi.png
+%%X11%%%%DATADIR%%/flags/buryatia-large.png
+%%X11%%%%DATADIR%%/flags/buryatia-shield-large.png
+%%X11%%%%DATADIR%%/flags/buryatia-shield.png
+%%X11%%%%DATADIR%%/flags/buryatia.png
 %%X11%%%%DATADIR%%/flags/byzantium-large.png
 %%X11%%%%DATADIR%%/flags/byzantium-shield-large.png
 %%X11%%%%DATADIR%%/flags/byzantium-shield.png
@@ -386,6 +486,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/canada_old-shield-large.png
 %%X11%%%%DATADIR%%/flags/canada_old-shield.png
 %%X11%%%%DATADIR%%/flags/canada_old.png
+%%X11%%%%DATADIR%%/flags/canar-large.png
+%%X11%%%%DATADIR%%/flags/canar-shield-large.png
+%%X11%%%%DATADIR%%/flags/canar-shield.png
+%%X11%%%%DATADIR%%/flags/canar.png
+%%X11%%%%DATADIR%%/flags/cantonese-large.png
+%%X11%%%%DATADIR%%/flags/cantonese-shield-large.png
+%%X11%%%%DATADIR%%/flags/cantonese-shield.png
+%%X11%%%%DATADIR%%/flags/cantonese.png
+%%X11%%%%DATADIR%%/flags/cape_verde-large.png
+%%X11%%%%DATADIR%%/flags/cape_verde-shield-large.png
+%%X11%%%%DATADIR%%/flags/cape_verde-shield.png
+%%X11%%%%DATADIR%%/flags/cape_verde.png
 %%X11%%%%DATADIR%%/flags/car-large.png
 %%X11%%%%DATADIR%%/flags/car-shield-large.png
 %%X11%%%%DATADIR%%/flags/car-shield.png
@@ -406,10 +518,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/celtiberian-shield-large.png
 %%X11%%%%DATADIR%%/flags/celtiberian-shield.png
 %%X11%%%%DATADIR%%/flags/celtiberian.png
+%%X11%%%%DATADIR%%/flags/celtic-large.png
+%%X11%%%%DATADIR%%/flags/celtic-shield-large.png
+%%X11%%%%DATADIR%%/flags/celtic-shield.png
+%%X11%%%%DATADIR%%/flags/celtic.png
 %%X11%%%%DATADIR%%/flags/central_america-large.png
 %%X11%%%%DATADIR%%/flags/central_america-shield-large.png
 %%X11%%%%DATADIR%%/flags/central_america-shield.png
 %%X11%%%%DATADIR%%/flags/central_america.png
+%%X11%%%%DATADIR%%/flags/central_lithuania-large.png
+%%X11%%%%DATADIR%%/flags/central_lithuania-shield-large.png
+%%X11%%%%DATADIR%%/flags/central_lithuania-shield.png
+%%X11%%%%DATADIR%%/flags/central_lithuania.png
+%%X11%%%%DATADIR%%/flags/chad-large.png
+%%X11%%%%DATADIR%%/flags/chad-shield-large.png
+%%X11%%%%DATADIR%%/flags/chad-shield.png
+%%X11%%%%DATADIR%%/flags/chad.png
 %%X11%%%%DATADIR%%/flags/cham-large.png
 %%X11%%%%DATADIR%%/flags/cham-shield-large.png
 %%X11%%%%DATADIR%%/flags/cham-shield.png
@@ -426,6 +550,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/cheyenne-shield-large.png
 %%X11%%%%DATADIR%%/flags/cheyenne-shield.png
 %%X11%%%%DATADIR%%/flags/cheyenne.png
+%%X11%%%%DATADIR%%/flags/chiapas-large.png
+%%X11%%%%DATADIR%%/flags/chiapas-shield-large.png
+%%X11%%%%DATADIR%%/flags/chiapas-shield.png
+%%X11%%%%DATADIR%%/flags/chiapas.png
+%%X11%%%%DATADIR%%/flags/chickasaw-large.png
+%%X11%%%%DATADIR%%/flags/chickasaw-shield-large.png
+%%X11%%%%DATADIR%%/flags/chickasaw-shield.png
+%%X11%%%%DATADIR%%/flags/chickasaw.png
 %%X11%%%%DATADIR%%/flags/chile-large.png
 %%X11%%%%DATADIR%%/flags/chile-shield-large.png
 %%X11%%%%DATADIR%%/flags/chile-shield.png
@@ -438,14 +570,30 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/china-shield-large.png
 %%X11%%%%DATADIR%%/flags/china-shield.png
 %%X11%%%%DATADIR%%/flags/china.png
+%%X11%%%%DATADIR%%/flags/choctaw-large.png
+%%X11%%%%DATADIR%%/flags/choctaw-shield-large.png
+%%X11%%%%DATADIR%%/flags/choctaw-shield.png
+%%X11%%%%DATADIR%%/flags/choctaw.png
 %%X11%%%%DATADIR%%/flags/chola-large.png
 %%X11%%%%DATADIR%%/flags/chola-shield-large.png
 %%X11%%%%DATADIR%%/flags/chola-shield.png
 %%X11%%%%DATADIR%%/flags/chola.png
+%%X11%%%%DATADIR%%/flags/chrobatian-large.png
+%%X11%%%%DATADIR%%/flags/chrobatian-shield-large.png
+%%X11%%%%DATADIR%%/flags/chrobatian-shield.png
+%%X11%%%%DATADIR%%/flags/chrobatian.png
 %%X11%%%%DATADIR%%/flags/chumash-large.png
 %%X11%%%%DATADIR%%/flags/chumash-shield-large.png
 %%X11%%%%DATADIR%%/flags/chumash-shield.png
 %%X11%%%%DATADIR%%/flags/chumash.png
+%%X11%%%%DATADIR%%/flags/chuvashia-large.png
+%%X11%%%%DATADIR%%/flags/chuvashia-shield-large.png
+%%X11%%%%DATADIR%%/flags/chuvashia-shield.png
+%%X11%%%%DATADIR%%/flags/chuvashia.png
+%%X11%%%%DATADIR%%/flags/clatsop-large.png
+%%X11%%%%DATADIR%%/flags/clatsop-shield-large.png
+%%X11%%%%DATADIR%%/flags/clatsop-shield.png
+%%X11%%%%DATADIR%%/flags/clatsop.png
 %%X11%%%%DATADIR%%/flags/colombia-large.png
 %%X11%%%%DATADIR%%/flags/colombia-shield-large.png
 %%X11%%%%DATADIR%%/flags/colombia-shield.png
@@ -454,6 +602,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/comanche-shield-large.png
 %%X11%%%%DATADIR%%/flags/comanche-shield.png
 %%X11%%%%DATADIR%%/flags/comanche.png
+%%X11%%%%DATADIR%%/flags/comoros-large.png
+%%X11%%%%DATADIR%%/flags/comoros-shield-large.png
+%%X11%%%%DATADIR%%/flags/comoros-shield.png
+%%X11%%%%DATADIR%%/flags/comoros.png
 %%X11%%%%DATADIR%%/flags/constantine-large.png
 %%X11%%%%DATADIR%%/flags/constantine-shield-large.png
 %%X11%%%%DATADIR%%/flags/constantine-shield.png
@@ -478,6 +630,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/courland-shield-large.png
 %%X11%%%%DATADIR%%/flags/courland-shield.png
 %%X11%%%%DATADIR%%/flags/courland.png
+%%X11%%%%DATADIR%%/flags/crete-large.png
+%%X11%%%%DATADIR%%/flags/crete-shield-large.png
+%%X11%%%%DATADIR%%/flags/crete-shield.png
+%%X11%%%%DATADIR%%/flags/crete.png
 %%X11%%%%DATADIR%%/flags/crimean_tatar-large.png
 %%X11%%%%DATADIR%%/flags/crimean_tatar-shield-large.png
 %%X11%%%%DATADIR%%/flags/crimean_tatar-shield.png
@@ -490,18 +646,34 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/cuba-shield-large.png
 %%X11%%%%DATADIR%%/flags/cuba-shield.png
 %%X11%%%%DATADIR%%/flags/cuba.png
+%%X11%%%%DATADIR%%/flags/cuyavia-large.png
+%%X11%%%%DATADIR%%/flags/cuyavia-shield-large.png
+%%X11%%%%DATADIR%%/flags/cuyavia-shield.png
+%%X11%%%%DATADIR%%/flags/cuyavia.png
 %%X11%%%%DATADIR%%/flags/cyprus-large.png
 %%X11%%%%DATADIR%%/flags/cyprus-shield-large.png
 %%X11%%%%DATADIR%%/flags/cyprus-shield.png
 %%X11%%%%DATADIR%%/flags/cyprus.png
+%%X11%%%%DATADIR%%/flags/cyrenaica-large.png
+%%X11%%%%DATADIR%%/flags/cyrenaica-shield-large.png
+%%X11%%%%DATADIR%%/flags/cyrenaica-shield.png
+%%X11%%%%DATADIR%%/flags/cyrenaica.png
 %%X11%%%%DATADIR%%/flags/czech-large.png
 %%X11%%%%DATADIR%%/flags/czech-shield-large.png
 %%X11%%%%DATADIR%%/flags/czech-shield.png
 %%X11%%%%DATADIR%%/flags/czech.png
+%%X11%%%%DATADIR%%/flags/czechoslovakia-large.png
+%%X11%%%%DATADIR%%/flags/czechoslovakia-shield-large.png
+%%X11%%%%DATADIR%%/flags/czechoslovakia-shield.png
+%%X11%%%%DATADIR%%/flags/czechoslovakia.png
 %%X11%%%%DATADIR%%/flags/dahomey-large.png
 %%X11%%%%DATADIR%%/flags/dahomey-shield-large.png
 %%X11%%%%DATADIR%%/flags/dahomey-shield.png
 %%X11%%%%DATADIR%%/flags/dahomey.png
+%%X11%%%%DATADIR%%/flags/darfur-large.png
+%%X11%%%%DATADIR%%/flags/darfur-shield-large.png
+%%X11%%%%DATADIR%%/flags/darfur-shield.png
+%%X11%%%%DATADIR%%/flags/darfur.png
 %%X11%%%%DATADIR%%/flags/ddr-large.png
 %%X11%%%%DATADIR%%/flags/ddr-shield-large.png
 %%X11%%%%DATADIR%%/flags/ddr-shield.png
@@ -510,6 +682,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/denmark-shield-large.png
 %%X11%%%%DATADIR%%/flags/denmark-shield.png
 %%X11%%%%DATADIR%%/flags/denmark.png
+%%X11%%%%DATADIR%%/flags/dgb-large.png
+%%X11%%%%DATADIR%%/flags/dgb-shield-large.png
+%%X11%%%%DATADIR%%/flags/dgb-shield.png
+%%X11%%%%DATADIR%%/flags/dgb.png
+%%X11%%%%DATADIR%%/flags/djibouti-large.png
+%%X11%%%%DATADIR%%/flags/djibouti-shield-large.png
+%%X11%%%%DATADIR%%/flags/djibouti-shield.png
+%%X11%%%%DATADIR%%/flags/djibouti.png
 %%X11%%%%DATADIR%%/flags/dominica-large.png
 %%X11%%%%DATADIR%%/flags/dominica-shield-large.png
 %%X11%%%%DATADIR%%/flags/dominica-shield.png
@@ -554,6 +734,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/england-shield-large.png
 %%X11%%%%DATADIR%%/flags/england-shield.png
 %%X11%%%%DATADIR%%/flags/england.png
+%%X11%%%%DATADIR%%/flags/epirus-large.png
+%%X11%%%%DATADIR%%/flags/epirus-shield-large.png
+%%X11%%%%DATADIR%%/flags/epirus-shield.png
+%%X11%%%%DATADIR%%/flags/epirus.png
+%%X11%%%%DATADIR%%/flags/equatorial_guinea-large.png
+%%X11%%%%DATADIR%%/flags/equatorial_guinea-shield-large.png
+%%X11%%%%DATADIR%%/flags/equatorial_guinea-shield.png
+%%X11%%%%DATADIR%%/flags/equatorial_guinea.png
 %%X11%%%%DATADIR%%/flags/eritrea-large.png
 %%X11%%%%DATADIR%%/flags/eritrea-shield-large.png
 %%X11%%%%DATADIR%%/flags/eritrea-shield.png
@@ -570,6 +758,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/ethiopia-shield-large.png
 %%X11%%%%DATADIR%%/flags/ethiopia-shield.png
 %%X11%%%%DATADIR%%/flags/ethiopia.png
+%%X11%%%%DATADIR%%/flags/ethiopia_old-large.png
+%%X11%%%%DATADIR%%/flags/ethiopia_old-shield-large.png
+%%X11%%%%DATADIR%%/flags/ethiopia_old-shield.png
+%%X11%%%%DATADIR%%/flags/ethiopia_old.png
 %%X11%%%%DATADIR%%/flags/etruscan-large.png
 %%X11%%%%DATADIR%%/flags/etruscan-shield-large.png
 %%X11%%%%DATADIR%%/flags/etruscan-shield.png
@@ -582,6 +774,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/euskadi-shield-large.png
 %%X11%%%%DATADIR%%/flags/euskadi-shield.png
 %%X11%%%%DATADIR%%/flags/euskadi.png
+%%X11%%%%DATADIR%%/flags/evenkia-large.png
+%%X11%%%%DATADIR%%/flags/evenkia-shield-large.png
+%%X11%%%%DATADIR%%/flags/evenkia-shield.png
+%%X11%%%%DATADIR%%/flags/evenkia.png
+%%X11%%%%DATADIR%%/flags/faroes-large.png
+%%X11%%%%DATADIR%%/flags/faroes-shield-large.png
+%%X11%%%%DATADIR%%/flags/faroes-shield.png
+%%X11%%%%DATADIR%%/flags/faroes.png
 %%X11%%%%DATADIR%%/flags/fiji-large.png
 %%X11%%%%DATADIR%%/flags/fiji-shield-large.png
 %%X11%%%%DATADIR%%/flags/fiji-shield.png
@@ -594,6 +794,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/flanders-shield-large.png
 %%X11%%%%DATADIR%%/flags/flanders-shield.png
 %%X11%%%%DATADIR%%/flags/flanders.png
+%%X11%%%%DATADIR%%/flags/florence-large.png
+%%X11%%%%DATADIR%%/flags/florence-shield-large.png
+%%X11%%%%DATADIR%%/flags/florence-shield.png
+%%X11%%%%DATADIR%%/flags/florence.png
 %%X11%%%%DATADIR%%/flags/france-large.png
 %%X11%%%%DATADIR%%/flags/france-shield-large.png
 %%X11%%%%DATADIR%%/flags/france-shield.png
@@ -606,10 +810,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/franconia-shield-large.png
 %%X11%%%%DATADIR%%/flags/franconia-shield.png
 %%X11%%%%DATADIR%%/flags/franconia.png
+%%X11%%%%DATADIR%%/flags/french_polynesia-large.png
+%%X11%%%%DATADIR%%/flags/french_polynesia-shield-large.png
+%%X11%%%%DATADIR%%/flags/french_polynesia-shield.png
+%%X11%%%%DATADIR%%/flags/french_polynesia.png
 %%X11%%%%DATADIR%%/flags/frisia-large.png
 %%X11%%%%DATADIR%%/flags/frisia-shield-large.png
 %%X11%%%%DATADIR%%/flags/frisia-shield.png
 %%X11%%%%DATADIR%%/flags/frisia.png
+%%X11%%%%DATADIR%%/flags/friuli-large.png
+%%X11%%%%DATADIR%%/flags/friuli-shield-large.png
+%%X11%%%%DATADIR%%/flags/friuli-shield.png
+%%X11%%%%DATADIR%%/flags/friuli.png
+%%X11%%%%DATADIR%%/flags/gabon-large.png
+%%X11%%%%DATADIR%%/flags/gabon-shield-large.png
+%%X11%%%%DATADIR%%/flags/gabon-shield.png
+%%X11%%%%DATADIR%%/flags/gabon.png
 %%X11%%%%DATADIR%%/flags/gael-large.png
 %%X11%%%%DATADIR%%/flags/gael-shield-large.png
 %%X11%%%%DATADIR%%/flags/gael-shield.png
@@ -618,6 +834,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/galicia-shield-large.png
 %%X11%%%%DATADIR%%/flags/galicia-shield.png
 %%X11%%%%DATADIR%%/flags/galicia.png
+%%X11%%%%DATADIR%%/flags/gambia-large.png
+%%X11%%%%DATADIR%%/flags/gambia-shield-large.png
+%%X11%%%%DATADIR%%/flags/gambia-shield.png
+%%X11%%%%DATADIR%%/flags/gambia.png
 %%X11%%%%DATADIR%%/flags/gaul-large.png
 %%X11%%%%DATADIR%%/flags/gaul-shield-large.png
 %%X11%%%%DATADIR%%/flags/gaul-shield.png
@@ -626,6 +846,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/georgia-shield-large.png
 %%X11%%%%DATADIR%%/flags/georgia-shield.png
 %%X11%%%%DATADIR%%/flags/georgia.png
+%%X11%%%%DATADIR%%/flags/germanic-large.png
+%%X11%%%%DATADIR%%/flags/germanic-shield-large.png
+%%X11%%%%DATADIR%%/flags/germanic-shield.png
+%%X11%%%%DATADIR%%/flags/germanic.png
 %%X11%%%%DATADIR%%/flags/germany-large.png
 %%X11%%%%DATADIR%%/flags/germany-shield-large.png
 %%X11%%%%DATADIR%%/flags/germany-shield.png
@@ -634,10 +858,26 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/ghana-shield-large.png
 %%X11%%%%DATADIR%%/flags/ghana-shield.png
 %%X11%%%%DATADIR%%/flags/ghana.png
+%%X11%%%%DATADIR%%/flags/ghana_ancient-large.png
+%%X11%%%%DATADIR%%/flags/ghana_ancient-shield-large.png
+%%X11%%%%DATADIR%%/flags/ghana_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/ghana_ancient.png
+%%X11%%%%DATADIR%%/flags/ghaznavid-large.png
+%%X11%%%%DATADIR%%/flags/ghaznavid-shield-large.png
+%%X11%%%%DATADIR%%/flags/ghaznavid-shield.png
+%%X11%%%%DATADIR%%/flags/ghaznavid.png
 %%X11%%%%DATADIR%%/flags/gokturk-large.png
 %%X11%%%%DATADIR%%/flags/gokturk-shield-large.png
 %%X11%%%%DATADIR%%/flags/gokturk-shield.png
 %%X11%%%%DATADIR%%/flags/gokturk.png
+%%X11%%%%DATADIR%%/flags/golden_horde-large.png
+%%X11%%%%DATADIR%%/flags/golden_horde-shield-large.png
+%%X11%%%%DATADIR%%/flags/golden_horde-shield.png
+%%X11%%%%DATADIR%%/flags/golden_horde.png
+%%X11%%%%DATADIR%%/flags/gothic-large.png
+%%X11%%%%DATADIR%%/flags/gothic-shield-large.png
+%%X11%%%%DATADIR%%/flags/gothic-shield.png
+%%X11%%%%DATADIR%%/flags/gothic.png
 %%X11%%%%DATADIR%%/flags/greater_poland-large.png
 %%X11%%%%DATADIR%%/flags/greater_poland-shield-large.png
 %%X11%%%%DATADIR%%/flags/greater_poland-shield.png
@@ -658,6 +898,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/grenada-shield-large.png
 %%X11%%%%DATADIR%%/flags/grenada-shield.png
 %%X11%%%%DATADIR%%/flags/grenada.png
+%%X11%%%%DATADIR%%/flags/grisons-large.png
+%%X11%%%%DATADIR%%/flags/grisons-shield-large.png
+%%X11%%%%DATADIR%%/flags/grisons-shield.png
+%%X11%%%%DATADIR%%/flags/grisons.png
 %%X11%%%%DATADIR%%/flags/guanche-large.png
 %%X11%%%%DATADIR%%/flags/guanche-shield-large.png
 %%X11%%%%DATADIR%%/flags/guanche-shield.png
@@ -670,6 +914,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/guatemala-shield-large.png
 %%X11%%%%DATADIR%%/flags/guatemala-shield.png
 %%X11%%%%DATADIR%%/flags/guatemala.png
+%%X11%%%%DATADIR%%/flags/guinea-bissau-large.png
+%%X11%%%%DATADIR%%/flags/guinea-bissau-shield-large.png
+%%X11%%%%DATADIR%%/flags/guinea-bissau-shield.png
+%%X11%%%%DATADIR%%/flags/guinea-bissau.png
+%%X11%%%%DATADIR%%/flags/guinea-large.png
+%%X11%%%%DATADIR%%/flags/guinea-shield-large.png
+%%X11%%%%DATADIR%%/flags/guinea-shield.png
+%%X11%%%%DATADIR%%/flags/guinea.png
 %%X11%%%%DATADIR%%/flags/gupta-large.png
 %%X11%%%%DATADIR%%/flags/gupta-shield-large.png
 %%X11%%%%DATADIR%%/flags/gupta-shield.png
@@ -706,6 +958,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/hawaii-shield-large.png
 %%X11%%%%DATADIR%%/flags/hawaii-shield.png
 %%X11%%%%DATADIR%%/flags/hawaii.png
+%%X11%%%%DATADIR%%/flags/helvetii-large.png
+%%X11%%%%DATADIR%%/flags/helvetii-shield-large.png
+%%X11%%%%DATADIR%%/flags/helvetii-shield.png
+%%X11%%%%DATADIR%%/flags/helvetii.png
+%%X11%%%%DATADIR%%/flags/hephthalite-large.png
+%%X11%%%%DATADIR%%/flags/hephthalite-shield-large.png
+%%X11%%%%DATADIR%%/flags/hephthalite-shield.png
+%%X11%%%%DATADIR%%/flags/hephthalite.png
 %%X11%%%%DATADIR%%/flags/hesse-large.png
 %%X11%%%%DATADIR%%/flags/hesse-shield-large.png
 %%X11%%%%DATADIR%%/flags/hesse-shield.png
@@ -734,6 +994,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/hungary-shield-large.png
 %%X11%%%%DATADIR%%/flags/hungary-shield.png
 %%X11%%%%DATADIR%%/flags/hungary.png
+%%X11%%%%DATADIR%%/flags/hunnic-large.png
+%%X11%%%%DATADIR%%/flags/hunnic-shield-large.png
+%%X11%%%%DATADIR%%/flags/hunnic-shield.png
+%%X11%%%%DATADIR%%/flags/hunnic.png
 %%X11%%%%DATADIR%%/flags/iberian-large.png
 %%X11%%%%DATADIR%%/flags/iberian-shield-large.png
 %%X11%%%%DATADIR%%/flags/iberian-shield.png
@@ -754,6 +1018,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/india-shield-large.png
 %%X11%%%%DATADIR%%/flags/india-shield.png
 %%X11%%%%DATADIR%%/flags/india.png
+%%X11%%%%DATADIR%%/flags/indoeuropean-large.png
+%%X11%%%%DATADIR%%/flags/indoeuropean-shield-large.png
+%%X11%%%%DATADIR%%/flags/indoeuropean-shield.png
+%%X11%%%%DATADIR%%/flags/indoeuropean.png
 %%X11%%%%DATADIR%%/flags/indonesia-large.png
 %%X11%%%%DATADIR%%/flags/indonesia-shield-large.png
 %%X11%%%%DATADIR%%/flags/indonesia-shield.png
@@ -790,6 +1058,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/israel-shield-large.png
 %%X11%%%%DATADIR%%/flags/israel-shield.png
 %%X11%%%%DATADIR%%/flags/israel.png
+%%X11%%%%DATADIR%%/flags/israel_ancient-large.png
+%%X11%%%%DATADIR%%/flags/israel_ancient-shield-large.png
+%%X11%%%%DATADIR%%/flags/israel_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/israel_ancient.png
 %%X11%%%%DATADIR%%/flags/italy-large.png
 %%X11%%%%DATADIR%%/flags/italy-shield-large.png
 %%X11%%%%DATADIR%%/flags/italy-shield.png
@@ -798,6 +1070,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/ivory_coast-shield-large.png
 %%X11%%%%DATADIR%%/flags/ivory_coast-shield.png
 %%X11%%%%DATADIR%%/flags/ivory_coast.png
+%%X11%%%%DATADIR%%/flags/jaffna-large.png
+%%X11%%%%DATADIR%%/flags/jaffna-shield-large.png
+%%X11%%%%DATADIR%%/flags/jaffna-shield.png
+%%X11%%%%DATADIR%%/flags/jaffna.png
 %%X11%%%%DATADIR%%/flags/jamaica-large.png
 %%X11%%%%DATADIR%%/flags/jamaica-shield-large.png
 %%X11%%%%DATADIR%%/flags/jamaica-shield.png
@@ -810,10 +1086,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/jbonai-shield-large.png
 %%X11%%%%DATADIR%%/flags/jbonai-shield.png
 %%X11%%%%DATADIR%%/flags/jbonai.png
+%%X11%%%%DATADIR%%/flags/jerusalem-large.png
+%%X11%%%%DATADIR%%/flags/jerusalem-shield-large.png
+%%X11%%%%DATADIR%%/flags/jerusalem-shield.png
+%%X11%%%%DATADIR%%/flags/jerusalem.png
 %%X11%%%%DATADIR%%/flags/jolof-large.png
 %%X11%%%%DATADIR%%/flags/jolof-shield-large.png
 %%X11%%%%DATADIR%%/flags/jolof-shield.png
 %%X11%%%%DATADIR%%/flags/jolof.png
+%%X11%%%%DATADIR%%/flags/jordan-large.png
+%%X11%%%%DATADIR%%/flags/jordan-shield-large.png
+%%X11%%%%DATADIR%%/flags/jordan-shield.png
+%%X11%%%%DATADIR%%/flags/jordan.png
 %%X11%%%%DATADIR%%/flags/kalmykia-large.png
 %%X11%%%%DATADIR%%/flags/kalmykia-shield-large.png
 %%X11%%%%DATADIR%%/flags/kalmykia-shield.png
@@ -830,10 +1114,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/karelia-shield-large.png
 %%X11%%%%DATADIR%%/flags/karelia-shield.png
 %%X11%%%%DATADIR%%/flags/karelia.png
+%%X11%%%%DATADIR%%/flags/karen-large.png
+%%X11%%%%DATADIR%%/flags/karen-shield-large.png
+%%X11%%%%DATADIR%%/flags/karen-shield.png
+%%X11%%%%DATADIR%%/flags/karen.png
 %%X11%%%%DATADIR%%/flags/kashmir-large.png
 %%X11%%%%DATADIR%%/flags/kashmir-shield-large.png
 %%X11%%%%DATADIR%%/flags/kashmir-shield.png
 %%X11%%%%DATADIR%%/flags/kashmir.png
+%%X11%%%%DATADIR%%/flags/kashubia-large.png
+%%X11%%%%DATADIR%%/flags/kashubia-shield-large.png
+%%X11%%%%DATADIR%%/flags/kashubia-shield.png
+%%X11%%%%DATADIR%%/flags/kashubia.png
+%%X11%%%%DATADIR%%/flags/katanga-large.png
+%%X11%%%%DATADIR%%/flags/katanga-shield-large.png
+%%X11%%%%DATADIR%%/flags/katanga-shield.png
+%%X11%%%%DATADIR%%/flags/katanga.png
 %%X11%%%%DATADIR%%/flags/kazakhstan-large.png
 %%X11%%%%DATADIR%%/flags/kazakhstan-shield-large.png
 %%X11%%%%DATADIR%%/flags/kazakhstan-shield.png
@@ -850,6 +1146,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/khazaria-shield-large.png
 %%X11%%%%DATADIR%%/flags/khazaria-shield.png
 %%X11%%%%DATADIR%%/flags/khazaria.png
+%%X11%%%%DATADIR%%/flags/khmer-large.png
+%%X11%%%%DATADIR%%/flags/khmer-shield-large.png
+%%X11%%%%DATADIR%%/flags/khmer-shield.png
+%%X11%%%%DATADIR%%/flags/khmer.png
 %%X11%%%%DATADIR%%/flags/khwarezm-large.png
 %%X11%%%%DATADIR%%/flags/khwarezm-shield-large.png
 %%X11%%%%DATADIR%%/flags/khwarezm-shield.png
@@ -858,6 +1158,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/kiev-shield-large.png
 %%X11%%%%DATADIR%%/flags/kiev-shield.png
 %%X11%%%%DATADIR%%/flags/kiev.png
+%%X11%%%%DATADIR%%/flags/kiribati-large.png
+%%X11%%%%DATADIR%%/flags/kiribati-shield-large.png
+%%X11%%%%DATADIR%%/flags/kiribati-shield.png
+%%X11%%%%DATADIR%%/flags/kiribati.png
 %%X11%%%%DATADIR%%/flags/kongo-large.png
 %%X11%%%%DATADIR%%/flags/kongo-shield-large.png
 %%X11%%%%DATADIR%%/flags/kongo-shield.png
@@ -874,10 +1178,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/kosovo-shield-large.png
 %%X11%%%%DATADIR%%/flags/kosovo-shield.png
 %%X11%%%%DATADIR%%/flags/kosovo.png
+%%X11%%%%DATADIR%%/flags/kuna_yala-large.png
+%%X11%%%%DATADIR%%/flags/kuna_yala-shield-large.png
+%%X11%%%%DATADIR%%/flags/kuna_yala-shield.png
+%%X11%%%%DATADIR%%/flags/kuna_yala.png
 %%X11%%%%DATADIR%%/flags/kurd-large.png
 %%X11%%%%DATADIR%%/flags/kurd-shield-large.png
 %%X11%%%%DATADIR%%/flags/kurd-shield.png
 %%X11%%%%DATADIR%%/flags/kurd.png
+%%X11%%%%DATADIR%%/flags/kuwait-large.png
+%%X11%%%%DATADIR%%/flags/kuwait-shield-large.png
+%%X11%%%%DATADIR%%/flags/kuwait-shield.png
+%%X11%%%%DATADIR%%/flags/kuwait.png
 %%X11%%%%DATADIR%%/flags/kyrgyzstan-large.png
 %%X11%%%%DATADIR%%/flags/kyrgyzstan-shield-large.png
 %%X11%%%%DATADIR%%/flags/kyrgyzstan-shield.png
@@ -890,6 +1202,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/laos-shield-large.png
 %%X11%%%%DATADIR%%/flags/laos-shield.png
 %%X11%%%%DATADIR%%/flags/laos.png
+%%X11%%%%DATADIR%%/flags/latin_empire-large.png
+%%X11%%%%DATADIR%%/flags/latin_empire-shield-large.png
+%%X11%%%%DATADIR%%/flags/latin_empire-shield.png
+%%X11%%%%DATADIR%%/flags/latin_empire.png
 %%X11%%%%DATADIR%%/flags/latvia-large.png
 %%X11%%%%DATADIR%%/flags/latvia-shield-large.png
 %%X11%%%%DATADIR%%/flags/latvia-shield.png
@@ -906,18 +1222,46 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/leon-shield-large.png
 %%X11%%%%DATADIR%%/flags/leon-shield.png
 %%X11%%%%DATADIR%%/flags/leon.png
+%%X11%%%%DATADIR%%/flags/lesotho-large.png
+%%X11%%%%DATADIR%%/flags/lesotho-shield-large.png
+%%X11%%%%DATADIR%%/flags/lesotho-shield.png
+%%X11%%%%DATADIR%%/flags/lesotho.png
+%%X11%%%%DATADIR%%/flags/lesotho_old-large.png
+%%X11%%%%DATADIR%%/flags/lesotho_old-shield-large.png
+%%X11%%%%DATADIR%%/flags/lesotho_old-shield.png
+%%X11%%%%DATADIR%%/flags/lesotho_old.png
+%%X11%%%%DATADIR%%/flags/liberia-large.png
+%%X11%%%%DATADIR%%/flags/liberia-shield-large.png
+%%X11%%%%DATADIR%%/flags/liberia-shield.png
+%%X11%%%%DATADIR%%/flags/liberia.png
+%%X11%%%%DATADIR%%/flags/liburnian-large.png
+%%X11%%%%DATADIR%%/flags/liburnian-shield-large.png
+%%X11%%%%DATADIR%%/flags/liburnian-shield.png
+%%X11%%%%DATADIR%%/flags/liburnian.png
 %%X11%%%%DATADIR%%/flags/libya-large.png
 %%X11%%%%DATADIR%%/flags/libya-shield-large.png
 %%X11%%%%DATADIR%%/flags/libya-shield.png
 %%X11%%%%DATADIR%%/flags/libya.png
+%%X11%%%%DATADIR%%/flags/libya_old-large.png
+%%X11%%%%DATADIR%%/flags/libya_old-shield-large.png
+%%X11%%%%DATADIR%%/flags/libya_old-shield.png
+%%X11%%%%DATADIR%%/flags/libya_old.png
 %%X11%%%%DATADIR%%/flags/liechtenstein-large.png
 %%X11%%%%DATADIR%%/flags/liechtenstein-shield-large.png
 %%X11%%%%DATADIR%%/flags/liechtenstein-shield.png
 %%X11%%%%DATADIR%%/flags/liechtenstein.png
+%%X11%%%%DATADIR%%/flags/liguria-large.png
+%%X11%%%%DATADIR%%/flags/liguria-shield-large.png
+%%X11%%%%DATADIR%%/flags/liguria-shield.png
+%%X11%%%%DATADIR%%/flags/liguria.png
 %%X11%%%%DATADIR%%/flags/lipkatatar-large.png
 %%X11%%%%DATADIR%%/flags/lipkatatar-shield-large.png
 %%X11%%%%DATADIR%%/flags/lipkatatar-shield.png
 %%X11%%%%DATADIR%%/flags/lipkatatar.png
+%%X11%%%%DATADIR%%/flags/lippe-large.png
+%%X11%%%%DATADIR%%/flags/lippe-shield-large.png
+%%X11%%%%DATADIR%%/flags/lippe-shield.png
+%%X11%%%%DATADIR%%/flags/lippe.png
 %%X11%%%%DATADIR%%/flags/lithuania-large.png
 %%X11%%%%DATADIR%%/flags/lithuania-shield-large.png
 %%X11%%%%DATADIR%%/flags/lithuania-shield.png
@@ -926,10 +1270,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/lorraine-shield-large.png
 %%X11%%%%DATADIR%%/flags/lorraine-shield.png
 %%X11%%%%DATADIR%%/flags/lorraine.png
+%%X11%%%%DATADIR%%/flags/luna-large.png
+%%X11%%%%DATADIR%%/flags/luna-shield-large.png
+%%X11%%%%DATADIR%%/flags/luna-shield.png
+%%X11%%%%DATADIR%%/flags/luna.png
 %%X11%%%%DATADIR%%/flags/lusatia-large.png
 %%X11%%%%DATADIR%%/flags/lusatia-shield-large.png
 %%X11%%%%DATADIR%%/flags/lusatia-shield.png
 %%X11%%%%DATADIR%%/flags/lusatia.png
+%%X11%%%%DATADIR%%/flags/luwian-large.png
+%%X11%%%%DATADIR%%/flags/luwian-shield-large.png
+%%X11%%%%DATADIR%%/flags/luwian-shield.png
+%%X11%%%%DATADIR%%/flags/luwian.png
 %%X11%%%%DATADIR%%/flags/luxembourg-large.png
 %%X11%%%%DATADIR%%/flags/luxembourg-shield-large.png
 %%X11%%%%DATADIR%%/flags/luxembourg-shield.png
@@ -962,6 +1314,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/malaysia-shield-large.png
 %%X11%%%%DATADIR%%/flags/malaysia-shield.png
 %%X11%%%%DATADIR%%/flags/malaysia.png
+%%X11%%%%DATADIR%%/flags/maldives-large.png
+%%X11%%%%DATADIR%%/flags/maldives-shield-large.png
+%%X11%%%%DATADIR%%/flags/maldives-shield.png
+%%X11%%%%DATADIR%%/flags/maldives.png
 %%X11%%%%DATADIR%%/flags/mali-large.png
 %%X11%%%%DATADIR%%/flags/mali-shield-large.png
 %%X11%%%%DATADIR%%/flags/mali-shield.png
@@ -974,6 +1330,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/malta-shield-large.png
 %%X11%%%%DATADIR%%/flags/malta-shield.png
 %%X11%%%%DATADIR%%/flags/malta.png
+%%X11%%%%DATADIR%%/flags/mamluk-large.png
+%%X11%%%%DATADIR%%/flags/mamluk-shield-large.png
+%%X11%%%%DATADIR%%/flags/mamluk-shield.png
+%%X11%%%%DATADIR%%/flags/mamluk.png
 %%X11%%%%DATADIR%%/flags/man-large.png
 %%X11%%%%DATADIR%%/flags/man-shield-large.png
 %%X11%%%%DATADIR%%/flags/man-shield.png
@@ -990,10 +1350,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/mapuche-shield-large.png
 %%X11%%%%DATADIR%%/flags/mapuche-shield.png
 %%X11%%%%DATADIR%%/flags/mapuche.png
+%%X11%%%%DATADIR%%/flags/marathi-large.png
+%%X11%%%%DATADIR%%/flags/marathi-shield-large.png
+%%X11%%%%DATADIR%%/flags/marathi-shield.png
+%%X11%%%%DATADIR%%/flags/marathi.png
 %%X11%%%%DATADIR%%/flags/mars-large.png
 %%X11%%%%DATADIR%%/flags/mars-shield-large.png
 %%X11%%%%DATADIR%%/flags/mars-shield.png
 %%X11%%%%DATADIR%%/flags/mars.png
+%%X11%%%%DATADIR%%/flags/mauritania-large.png
+%%X11%%%%DATADIR%%/flags/mauritania-shield-large.png
+%%X11%%%%DATADIR%%/flags/mauritania-shield.png
+%%X11%%%%DATADIR%%/flags/mauritania.png
+%%X11%%%%DATADIR%%/flags/mauritius-large.png
+%%X11%%%%DATADIR%%/flags/mauritius-shield-large.png
+%%X11%%%%DATADIR%%/flags/mauritius-shield.png
+%%X11%%%%DATADIR%%/flags/mauritius.png
 %%X11%%%%DATADIR%%/flags/maya-large.png
 %%X11%%%%DATADIR%%/flags/maya-shield-large.png
 %%X11%%%%DATADIR%%/flags/maya-shield.png
@@ -1006,6 +1378,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/mecklenburg-shield-large.png
 %%X11%%%%DATADIR%%/flags/mecklenburg-shield.png
 %%X11%%%%DATADIR%%/flags/mecklenburg.png
+%%X11%%%%DATADIR%%/flags/median-large.png
+%%X11%%%%DATADIR%%/flags/median-shield-large.png
+%%X11%%%%DATADIR%%/flags/median-shield.png
+%%X11%%%%DATADIR%%/flags/median.png
+%%X11%%%%DATADIR%%/flags/messapian-large.png
+%%X11%%%%DATADIR%%/flags/messapian-shield-large.png
+%%X11%%%%DATADIR%%/flags/messapian-shield.png
+%%X11%%%%DATADIR%%/flags/messapian.png
 %%X11%%%%DATADIR%%/flags/metis-large.png
 %%X11%%%%DATADIR%%/flags/metis-shield-large.png
 %%X11%%%%DATADIR%%/flags/metis-shield.png
@@ -1030,6 +1410,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/miskito-shield-large.png
 %%X11%%%%DATADIR%%/flags/miskito-shield.png
 %%X11%%%%DATADIR%%/flags/miskito.png
+%%X11%%%%DATADIR%%/flags/mitanni-large.png
+%%X11%%%%DATADIR%%/flags/mitanni-shield-large.png
+%%X11%%%%DATADIR%%/flags/mitanni-shield.png
+%%X11%%%%DATADIR%%/flags/mitanni.png
 %%X11%%%%DATADIR%%/flags/mixtec-large.png
 %%X11%%%%DATADIR%%/flags/mixtec-shield-large.png
 %%X11%%%%DATADIR%%/flags/mixtec-shield.png
@@ -1038,6 +1422,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/moldova-shield-large.png
 %%X11%%%%DATADIR%%/flags/moldova-shield.png
 %%X11%%%%DATADIR%%/flags/moldova.png
+%%X11%%%%DATADIR%%/flags/moluccas-large.png
+%%X11%%%%DATADIR%%/flags/moluccas-shield-large.png
+%%X11%%%%DATADIR%%/flags/moluccas-shield.png
+%%X11%%%%DATADIR%%/flags/moluccas.png
+%%X11%%%%DATADIR%%/flags/mon-large.png
+%%X11%%%%DATADIR%%/flags/mon-shield-large.png
+%%X11%%%%DATADIR%%/flags/mon-shield.png
+%%X11%%%%DATADIR%%/flags/mon.png
 %%X11%%%%DATADIR%%/flags/monaco_alternative-large.png
 %%X11%%%%DATADIR%%/flags/monaco_alternative-shield-large.png
 %%X11%%%%DATADIR%%/flags/monaco_alternative-shield.png
@@ -1062,6 +1454,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/morocco-shield-large.png
 %%X11%%%%DATADIR%%/flags/morocco-shield.png
 %%X11%%%%DATADIR%%/flags/morocco.png
+%%X11%%%%DATADIR%%/flags/moscow-large.png
+%%X11%%%%DATADIR%%/flags/moscow-shield-large.png
+%%X11%%%%DATADIR%%/flags/moscow-shield.png
+%%X11%%%%DATADIR%%/flags/moscow.png
 %%X11%%%%DATADIR%%/flags/mozambique-large.png
 %%X11%%%%DATADIR%%/flags/mozambique-shield-large.png
 %%X11%%%%DATADIR%%/flags/mozambique-shield.png
@@ -1082,6 +1478,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/myanmar-shield-large.png
 %%X11%%%%DATADIR%%/flags/myanmar-shield.png
 %%X11%%%%DATADIR%%/flags/myanmar.png
+%%X11%%%%DATADIR%%/flags/nagorno_karabakh-large.png
+%%X11%%%%DATADIR%%/flags/nagorno_karabakh-shield-large.png
+%%X11%%%%DATADIR%%/flags/nagorno_karabakh-shield.png
+%%X11%%%%DATADIR%%/flags/nagorno_karabakh.png
 %%X11%%%%DATADIR%%/flags/namibia-large.png
 %%X11%%%%DATADIR%%/flags/namibia-shield-large.png
 %%X11%%%%DATADIR%%/flags/namibia-shield.png
@@ -1094,10 +1494,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/nato-shield-large.png
 %%X11%%%%DATADIR%%/flags/nato-shield.png
 %%X11%%%%DATADIR%%/flags/nato.png
+%%X11%%%%DATADIR%%/flags/nauru-large.png
+%%X11%%%%DATADIR%%/flags/nauru-shield-large.png
+%%X11%%%%DATADIR%%/flags/nauru-shield.png
+%%X11%%%%DATADIR%%/flags/nauru.png
 %%X11%%%%DATADIR%%/flags/navajo-large.png
 %%X11%%%%DATADIR%%/flags/navajo-shield-large.png
 %%X11%%%%DATADIR%%/flags/navajo-shield.png
 %%X11%%%%DATADIR%%/flags/navajo.png
+%%X11%%%%DATADIR%%/flags/nenetsia-large.png
+%%X11%%%%DATADIR%%/flags/nenetsia-shield-large.png
+%%X11%%%%DATADIR%%/flags/nenetsia-shield.png
+%%X11%%%%DATADIR%%/flags/nenetsia.png
 %%X11%%%%DATADIR%%/flags/nepal-large.png
 %%X11%%%%DATADIR%%/flags/nepal-shield-large.png
 %%X11%%%%DATADIR%%/flags/nepal-shield.png
@@ -1110,6 +1518,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/netherlands-shield-large.png
 %%X11%%%%DATADIR%%/flags/netherlands-shield.png
 %%X11%%%%DATADIR%%/flags/netherlands.png
+%%X11%%%%DATADIR%%/flags/netherlands_antilles-large.png
+%%X11%%%%DATADIR%%/flags/netherlands_antilles-shield-large.png
+%%X11%%%%DATADIR%%/flags/netherlands_antilles-shield.png
+%%X11%%%%DATADIR%%/flags/netherlands_antilles.png
 %%X11%%%%DATADIR%%/flags/newfoundland-large.png
 %%X11%%%%DATADIR%%/flags/newfoundland-shield-large.png
 %%X11%%%%DATADIR%%/flags/newfoundland-shield.png
@@ -1198,6 +1610,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/oz-shield-large.png
 %%X11%%%%DATADIR%%/flags/oz-shield.png
 %%X11%%%%DATADIR%%/flags/oz.png
+%%X11%%%%DATADIR%%/flags/paeonia-large.png
+%%X11%%%%DATADIR%%/flags/paeonia-shield-large.png
+%%X11%%%%DATADIR%%/flags/paeonia-shield.png
+%%X11%%%%DATADIR%%/flags/paeonia.png
 %%X11%%%%DATADIR%%/flags/pakistan-large.png
 %%X11%%%%DATADIR%%/flags/pakistan-shield-large.png
 %%X11%%%%DATADIR%%/flags/pakistan-shield.png
@@ -1226,10 +1642,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/paraguay-shield-large.png
 %%X11%%%%DATADIR%%/flags/paraguay-shield.png
 %%X11%%%%DATADIR%%/flags/paraguay.png
+%%X11%%%%DATADIR%%/flags/parthia-large.png
+%%X11%%%%DATADIR%%/flags/parthia-shield-large.png
+%%X11%%%%DATADIR%%/flags/parthia-shield.png
+%%X11%%%%DATADIR%%/flags/parthia.png
 %%X11%%%%DATADIR%%/flags/pashtun-large.png
 %%X11%%%%DATADIR%%/flags/pashtun-shield-large.png
 %%X11%%%%DATADIR%%/flags/pashtun-shield.png
 %%X11%%%%DATADIR%%/flags/pashtun.png
+%%X11%%%%DATADIR%%/flags/pelasgian-large.png
+%%X11%%%%DATADIR%%/flags/pelasgian-shield-large.png
+%%X11%%%%DATADIR%%/flags/pelasgian-shield.png
+%%X11%%%%DATADIR%%/flags/pelasgian.png
 %%X11%%%%DATADIR%%/flags/peru-large.png
 %%X11%%%%DATADIR%%/flags/peru-shield-large.png
 %%X11%%%%DATADIR%%/flags/peru-shield.png
@@ -1242,6 +1666,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/phoenicia-shield-large.png
 %%X11%%%%DATADIR%%/flags/phoenicia-shield.png
 %%X11%%%%DATADIR%%/flags/phoenicia.png
+%%X11%%%%DATADIR%%/flags/phrygian-large.png
+%%X11%%%%DATADIR%%/flags/phrygian-shield-large.png
+%%X11%%%%DATADIR%%/flags/phrygian-shield.png
+%%X11%%%%DATADIR%%/flags/phrygian.png
+%%X11%%%%DATADIR%%/flags/pict-large.png
+%%X11%%%%DATADIR%%/flags/pict-shield-large.png
+%%X11%%%%DATADIR%%/flags/pict-shield.png
+%%X11%%%%DATADIR%%/flags/pict.png
 %%X11%%%%DATADIR%%/flags/piedmont-large.png
 %%X11%%%%DATADIR%%/flags/piedmont-shield-large.png
 %%X11%%%%DATADIR%%/flags/piedmont-shield.png
@@ -1270,6 +1702,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/portugal-shield-large.png
 %%X11%%%%DATADIR%%/flags/portugal-shield.png
 %%X11%%%%DATADIR%%/flags/portugal.png
+%%X11%%%%DATADIR%%/flags/prusai-large.png
+%%X11%%%%DATADIR%%/flags/prusai-shield-large.png
+%%X11%%%%DATADIR%%/flags/prusai-shield.png
+%%X11%%%%DATADIR%%/flags/prusai.png
 %%X11%%%%DATADIR%%/flags/prussia-large.png
 %%X11%%%%DATADIR%%/flags/prussia-shield-large.png
 %%X11%%%%DATADIR%%/flags/prussia-shield.png
@@ -1282,6 +1718,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/purhepecha-shield-large.png
 %%X11%%%%DATADIR%%/flags/purhepecha-shield.png
 %%X11%%%%DATADIR%%/flags/purhepecha.png
+%%X11%%%%DATADIR%%/flags/qatar-large.png
+%%X11%%%%DATADIR%%/flags/qatar-shield-large.png
+%%X11%%%%DATADIR%%/flags/qatar-shield.png
+%%X11%%%%DATADIR%%/flags/qatar.png
 %%X11%%%%DATADIR%%/flags/qing-large.png
 %%X11%%%%DATADIR%%/flags/qing-shield-large.png
 %%X11%%%%DATADIR%%/flags/qing-shield.png
@@ -1290,10 +1730,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/quebec-shield-large.png
 %%X11%%%%DATADIR%%/flags/quebec-shield.png
 %%X11%%%%DATADIR%%/flags/quebec.png
+%%X11%%%%DATADIR%%/flags/r_congo-large.png
+%%X11%%%%DATADIR%%/flags/r_congo-shield-large.png
+%%X11%%%%DATADIR%%/flags/r_congo-shield.png
+%%X11%%%%DATADIR%%/flags/r_congo.png
+%%X11%%%%DATADIR%%/flags/rapa_nui-large.png
+%%X11%%%%DATADIR%%/flags/rapa_nui-shield-large.png
+%%X11%%%%DATADIR%%/flags/rapa_nui-shield.png
+%%X11%%%%DATADIR%%/flags/rapa_nui.png
 %%X11%%%%DATADIR%%/flags/raramuri-large.png
 %%X11%%%%DATADIR%%/flags/raramuri-shield-large.png
 %%X11%%%%DATADIR%%/flags/raramuri-shield.png
 %%X11%%%%DATADIR%%/flags/raramuri.png
+%%X11%%%%DATADIR%%/flags/rhineland-large.png
+%%X11%%%%DATADIR%%/flags/rhineland-shield-large.png
+%%X11%%%%DATADIR%%/flags/rhineland-shield.png
+%%X11%%%%DATADIR%%/flags/rhineland.png
 %%X11%%%%DATADIR%%/flags/rif-large.png
 %%X11%%%%DATADIR%%/flags/rif-shield-large.png
 %%X11%%%%DATADIR%%/flags/rif-shield.png
@@ -1322,14 +1774,42 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/ryukyu-shield-large.png
 %%X11%%%%DATADIR%%/flags/ryukyu-shield.png
 %%X11%%%%DATADIR%%/flags/ryukyu.png
+%%X11%%%%DATADIR%%/flags/sabinium-large.png
+%%X11%%%%DATADIR%%/flags/sabinium-shield-large.png
+%%X11%%%%DATADIR%%/flags/sabinium-shield.png
+%%X11%%%%DATADIR%%/flags/sabinium.png
 %%X11%%%%DATADIR%%/flags/sadr-large.png
 %%X11%%%%DATADIR%%/flags/sadr-shield-large.png
 %%X11%%%%DATADIR%%/flags/sadr-shield.png
 %%X11%%%%DATADIR%%/flags/sadr.png
+%%X11%%%%DATADIR%%/flags/saint_kitts_and_nevis-large.png
+%%X11%%%%DATADIR%%/flags/saint_kitts_and_nevis-shield-large.png
+%%X11%%%%DATADIR%%/flags/saint_kitts_and_nevis-shield.png
+%%X11%%%%DATADIR%%/flags/saint_kitts_and_nevis.png
+%%X11%%%%DATADIR%%/flags/saint_lucia-large.png
+%%X11%%%%DATADIR%%/flags/saint_lucia-shield-large.png
+%%X11%%%%DATADIR%%/flags/saint_lucia-shield.png
+%%X11%%%%DATADIR%%/flags/saint_lucia.png
+%%X11%%%%DATADIR%%/flags/saka-large.png
+%%X11%%%%DATADIR%%/flags/saka-shield-large.png
+%%X11%%%%DATADIR%%/flags/saka-shield.png
+%%X11%%%%DATADIR%%/flags/saka.png
 %%X11%%%%DATADIR%%/flags/sakha-large.png
 %%X11%%%%DATADIR%%/flags/sakha-shield-large.png
 %%X11%%%%DATADIR%%/flags/sakha-shield.png
 %%X11%%%%DATADIR%%/flags/sakha.png
+%%X11%%%%DATADIR%%/flags/salish-large.png
+%%X11%%%%DATADIR%%/flags/salish-shield-large.png
+%%X11%%%%DATADIR%%/flags/salish-shield.png
+%%X11%%%%DATADIR%%/flags/salish.png
+%%X11%%%%DATADIR%%/flags/samnium-large.png
+%%X11%%%%DATADIR%%/flags/samnium-shield-large.png
+%%X11%%%%DATADIR%%/flags/samnium-shield.png
+%%X11%%%%DATADIR%%/flags/samnium.png
+%%X11%%%%DATADIR%%/flags/samoa-large.png
+%%X11%%%%DATADIR%%/flags/samoa-shield-large.png
+%%X11%%%%DATADIR%%/flags/samoa-shield.png
+%%X11%%%%DATADIR%%/flags/samoa.png
 %%X11%%%%DATADIR%%/flags/samogitia-large.png
 %%X11%%%%DATADIR%%/flags/samogitia-shield-large.png
 %%X11%%%%DATADIR%%/flags/samogitia-shield.png
@@ -1338,10 +1818,18 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/san_marino-shield-large.png
 %%X11%%%%DATADIR%%/flags/san_marino-shield.png
 %%X11%%%%DATADIR%%/flags/san_marino.png
+%%X11%%%%DATADIR%%/flags/sao_tome_and_principe-large.png
+%%X11%%%%DATADIR%%/flags/sao_tome_and_principe-shield-large.png
+%%X11%%%%DATADIR%%/flags/sao_tome_and_principe-shield.png
+%%X11%%%%DATADIR%%/flags/sao_tome_and_principe.png
 %%X11%%%%DATADIR%%/flags/sapmi-large.png
 %%X11%%%%DATADIR%%/flags/sapmi-shield-large.png
 %%X11%%%%DATADIR%%/flags/sapmi-shield.png
 %%X11%%%%DATADIR%%/flags/sapmi.png
+%%X11%%%%DATADIR%%/flags/sardinia-large.png
+%%X11%%%%DATADIR%%/flags/sardinia-shield-large.png
+%%X11%%%%DATADIR%%/flags/sardinia-shield.png
+%%X11%%%%DATADIR%%/flags/sardinia.png
 %%X11%%%%DATADIR%%/flags/sarmatia-large.png
 %%X11%%%%DATADIR%%/flags/sarmatia-shield-large.png
 %%X11%%%%DATADIR%%/flags/sarmatia-shield.png
@@ -1358,6 +1846,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/saxony-shield-large.png
 %%X11%%%%DATADIR%%/flags/saxony-shield.png
 %%X11%%%%DATADIR%%/flags/saxony.png
+%%X11%%%%DATADIR%%/flags/scania-large.png
+%%X11%%%%DATADIR%%/flags/scania-shield-large.png
+%%X11%%%%DATADIR%%/flags/scania-shield.png
+%%X11%%%%DATADIR%%/flags/scania.png
 %%X11%%%%DATADIR%%/flags/schleswig-holstein-large.png
 %%X11%%%%DATADIR%%/flags/schleswig-holstein-shield-large.png
 %%X11%%%%DATADIR%%/flags/schleswig-holstein-shield.png
@@ -1366,6 +1858,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/scotland-shield-large.png
 %%X11%%%%DATADIR%%/flags/scotland-shield.png
 %%X11%%%%DATADIR%%/flags/scotland.png
+%%X11%%%%DATADIR%%/flags/scottishgaelic-large.png
+%%X11%%%%DATADIR%%/flags/scottishgaelic-shield-large.png
+%%X11%%%%DATADIR%%/flags/scottishgaelic-shield.png
+%%X11%%%%DATADIR%%/flags/scottishgaelic.png
 %%X11%%%%DATADIR%%/flags/scythia-large.png
 %%X11%%%%DATADIR%%/flags/scythia-shield-large.png
 %%X11%%%%DATADIR%%/flags/scythia-shield.png
@@ -1374,6 +1870,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/seleucid-shield-large.png
 %%X11%%%%DATADIR%%/flags/seleucid-shield.png
 %%X11%%%%DATADIR%%/flags/seleucid.png
+%%X11%%%%DATADIR%%/flags/seljuk-large.png
+%%X11%%%%DATADIR%%/flags/seljuk-shield-large.png
+%%X11%%%%DATADIR%%/flags/seljuk-shield.png
+%%X11%%%%DATADIR%%/flags/seljuk.png
+%%X11%%%%DATADIR%%/flags/seminole-large.png
+%%X11%%%%DATADIR%%/flags/seminole-shield-large.png
+%%X11%%%%DATADIR%%/flags/seminole-shield.png
+%%X11%%%%DATADIR%%/flags/seminole.png
 %%X11%%%%DATADIR%%/flags/senegal-large.png
 %%X11%%%%DATADIR%%/flags/senegal-shield-large.png
 %%X11%%%%DATADIR%%/flags/senegal-shield.png
@@ -1382,10 +1886,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/serbia-shield-large.png
 %%X11%%%%DATADIR%%/flags/serbia-shield.png
 %%X11%%%%DATADIR%%/flags/serbia.png
+%%X11%%%%DATADIR%%/flags/seychelles-large.png
+%%X11%%%%DATADIR%%/flags/seychelles-shield-large.png
+%%X11%%%%DATADIR%%/flags/seychelles-shield.png
+%%X11%%%%DATADIR%%/flags/seychelles.png
+%%X11%%%%DATADIR%%/flags/shan-large.png
+%%X11%%%%DATADIR%%/flags/shan-shield-large.png
+%%X11%%%%DATADIR%%/flags/shan-shield.png
+%%X11%%%%DATADIR%%/flags/shan.png
 %%X11%%%%DATADIR%%/flags/shawnee-large.png
 %%X11%%%%DATADIR%%/flags/shawnee-shield-large.png
 %%X11%%%%DATADIR%%/flags/shawnee-shield.png
 %%X11%%%%DATADIR%%/flags/shawnee.png
+%%X11%%%%DATADIR%%/flags/sherpa-large.png
+%%X11%%%%DATADIR%%/flags/sherpa-shield-large.png
+%%X11%%%%DATADIR%%/flags/sherpa-shield.png
+%%X11%%%%DATADIR%%/flags/sherpa.png
 %%X11%%%%DATADIR%%/flags/siberia-large.png
 %%X11%%%%DATADIR%%/flags/siberia-shield-large.png
 %%X11%%%%DATADIR%%/flags/siberia-shield.png
@@ -1394,6 +1910,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/sicily-shield-large.png
 %%X11%%%%DATADIR%%/flags/sicily-shield.png
 %%X11%%%%DATADIR%%/flags/sicily.png
+%%X11%%%%DATADIR%%/flags/sierra_leone-large.png
+%%X11%%%%DATADIR%%/flags/sierra_leone-shield-large.png
+%%X11%%%%DATADIR%%/flags/sierra_leone-shield.png
+%%X11%%%%DATADIR%%/flags/sierra_leone.png
 %%X11%%%%DATADIR%%/flags/sikh-large.png
 %%X11%%%%DATADIR%%/flags/sikh-shield-large.png
 %%X11%%%%DATADIR%%/flags/sikh-shield.png
@@ -1410,6 +1930,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/singapore-shield-large.png
 %%X11%%%%DATADIR%%/flags/singapore-shield.png
 %%X11%%%%DATADIR%%/flags/singapore.png
+%%X11%%%%DATADIR%%/flags/sinhalese-large.png
+%%X11%%%%DATADIR%%/flags/sinhalese-shield-large.png
+%%X11%%%%DATADIR%%/flags/sinhalese-shield.png
+%%X11%%%%DATADIR%%/flags/sinhalese.png
 %%X11%%%%DATADIR%%/flags/slavic-large.png
 %%X11%%%%DATADIR%%/flags/slavic-shield-large.png
 %%X11%%%%DATADIR%%/flags/slavic-shield.png
@@ -1422,10 +1946,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/slovenia-shield-large.png
 %%X11%%%%DATADIR%%/flags/slovenia-shield.png
 %%X11%%%%DATADIR%%/flags/slovenia.png
+%%X11%%%%DATADIR%%/flags/sokoto-large.png
+%%X11%%%%DATADIR%%/flags/sokoto-shield-large.png
+%%X11%%%%DATADIR%%/flags/sokoto-shield.png
+%%X11%%%%DATADIR%%/flags/sokoto.png
+%%X11%%%%DATADIR%%/flags/solomon_islands-large.png
+%%X11%%%%DATADIR%%/flags/solomon_islands-shield-large.png
+%%X11%%%%DATADIR%%/flags/solomon_islands-shield.png
+%%X11%%%%DATADIR%%/flags/solomon_islands.png
 %%X11%%%%DATADIR%%/flags/somalia-large.png
 %%X11%%%%DATADIR%%/flags/somalia-shield-large.png
 %%X11%%%%DATADIR%%/flags/somalia-shield.png
 %%X11%%%%DATADIR%%/flags/somalia.png
+%%X11%%%%DATADIR%%/flags/somaliland-large.png
+%%X11%%%%DATADIR%%/flags/somaliland-shield-large.png
+%%X11%%%%DATADIR%%/flags/somaliland-shield.png
+%%X11%%%%DATADIR%%/flags/somaliland.png
 %%X11%%%%DATADIR%%/flags/songhai-large.png
 %%X11%%%%DATADIR%%/flags/songhai-shield-large.png
 %%X11%%%%DATADIR%%/flags/songhai-shield.png
@@ -1442,6 +1978,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/southern_cross-shield-large.png
 %%X11%%%%DATADIR%%/flags/southern_cross-shield.png
 %%X11%%%%DATADIR%%/flags/southern_cross.png
+%%X11%%%%DATADIR%%/flags/southern_sudan-large.png
+%%X11%%%%DATADIR%%/flags/southern_sudan-shield-large.png
+%%X11%%%%DATADIR%%/flags/southern_sudan-shield.png
+%%X11%%%%DATADIR%%/flags/southern_sudan.png
 %%X11%%%%DATADIR%%/flags/soviet-large.png
 %%X11%%%%DATADIR%%/flags/soviet-shield-large.png
 %%X11%%%%DATADIR%%/flags/soviet-shield.png
@@ -1466,6 +2006,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/sudan-shield-large.png
 %%X11%%%%DATADIR%%/flags/sudan-shield.png
 %%X11%%%%DATADIR%%/flags/sudan.png
+%%X11%%%%DATADIR%%/flags/suebian-large.png
+%%X11%%%%DATADIR%%/flags/suebian-shield-large.png
+%%X11%%%%DATADIR%%/flags/suebian-shield.png
+%%X11%%%%DATADIR%%/flags/suebian.png
 %%X11%%%%DATADIR%%/flags/sumeria-large.png
 %%X11%%%%DATADIR%%/flags/sumeria-shield-large.png
 %%X11%%%%DATADIR%%/flags/sumeria-shield.png
@@ -1478,6 +2022,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/svg-shield-large.png
 %%X11%%%%DATADIR%%/flags/svg-shield.png
 %%X11%%%%DATADIR%%/flags/svg.png
+%%X11%%%%DATADIR%%/flags/swahili-large.png
+%%X11%%%%DATADIR%%/flags/swahili-shield-large.png
+%%X11%%%%DATADIR%%/flags/swahili-shield.png
+%%X11%%%%DATADIR%%/flags/swahili.png
 %%X11%%%%DATADIR%%/flags/swaziland-large.png
 %%X11%%%%DATADIR%%/flags/swaziland-shield-large.png
 %%X11%%%%DATADIR%%/flags/swaziland-shield.png
@@ -1486,10 +2034,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/sweden-shield-large.png
 %%X11%%%%DATADIR%%/flags/sweden-shield.png
 %%X11%%%%DATADIR%%/flags/sweden.png
-%%X11%%%%DATADIR%%/flags/swiss-large.png
-%%X11%%%%DATADIR%%/flags/swiss-shield-large.png
-%%X11%%%%DATADIR%%/flags/swiss-shield.png
-%%X11%%%%DATADIR%%/flags/swiss.png
+%%X11%%%%DATADIR%%/flags/switzerland-large.png
+%%X11%%%%DATADIR%%/flags/switzerland-shield-large.png
+%%X11%%%%DATADIR%%/flags/switzerland-shield.png
+%%X11%%%%DATADIR%%/flags/switzerland.png
 %%X11%%%%DATADIR%%/flags/syria-large.png
 %%X11%%%%DATADIR%%/flags/syria-shield-large.png
 %%X11%%%%DATADIR%%/flags/syria-shield.png
@@ -1510,6 +2058,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/tajikistan-shield-large.png
 %%X11%%%%DATADIR%%/flags/tajikistan-shield.png
 %%X11%%%%DATADIR%%/flags/tajikistan.png
+%%X11%%%%DATADIR%%/flags/tanganyika-large.png
+%%X11%%%%DATADIR%%/flags/tanganyika-shield-large.png
+%%X11%%%%DATADIR%%/flags/tanganyika-shield.png
+%%X11%%%%DATADIR%%/flags/tanganyika.png
 %%X11%%%%DATADIR%%/flags/tannu_tuva-large.png
 %%X11%%%%DATADIR%%/flags/tannu_tuva-shield-large.png
 %%X11%%%%DATADIR%%/flags/tannu_tuva-shield.png
@@ -1542,6 +2094,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/thrace-shield-large.png
 %%X11%%%%DATADIR%%/flags/thrace-shield.png
 %%X11%%%%DATADIR%%/flags/thrace.png
+%%X11%%%%DATADIR%%/flags/thuringia-large.png
+%%X11%%%%DATADIR%%/flags/thuringia-shield-large.png
+%%X11%%%%DATADIR%%/flags/thuringia-shield.png
+%%X11%%%%DATADIR%%/flags/thuringia.png
 %%X11%%%%DATADIR%%/flags/tibet-large.png
 %%X11%%%%DATADIR%%/flags/tibet-shield-large.png
 %%X11%%%%DATADIR%%/flags/tibet-shield.png
@@ -1566,10 +2122,30 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/tonga-shield-large.png
 %%X11%%%%DATADIR%%/flags/tonga-shield.png
 %%X11%%%%DATADIR%%/flags/tonga.png
+%%X11%%%%DATADIR%%/flags/transnistria-large.png
+%%X11%%%%DATADIR%%/flags/transnistria-shield-large.png
+%%X11%%%%DATADIR%%/flags/transnistria-shield.png
+%%X11%%%%DATADIR%%/flags/transnistria.png
 %%X11%%%%DATADIR%%/flags/transylvania-large.png
 %%X11%%%%DATADIR%%/flags/transylvania-shield-large.png
 %%X11%%%%DATADIR%%/flags/transylvania-shield.png
 %%X11%%%%DATADIR%%/flags/transylvania.png
+%%X11%%%%DATADIR%%/flags/trebizond-large.png
+%%X11%%%%DATADIR%%/flags/trebizond-shield-large.png
+%%X11%%%%DATADIR%%/flags/trebizond-shield.png
+%%X11%%%%DATADIR%%/flags/trebizond.png
+%%X11%%%%DATADIR%%/flags/trinidad_and_tobago-large.png
+%%X11%%%%DATADIR%%/flags/trinidad_and_tobago-shield-large.png
+%%X11%%%%DATADIR%%/flags/trinidad_and_tobago-shield.png
+%%X11%%%%DATADIR%%/flags/trinidad_and_tobago.png
+%%X11%%%%DATADIR%%/flags/trnc-large.png
+%%X11%%%%DATADIR%%/flags/trnc-shield-large.png
+%%X11%%%%DATADIR%%/flags/trnc-shield.png
+%%X11%%%%DATADIR%%/flags/trnc.png
+%%X11%%%%DATADIR%%/flags/tuareg-large.png
+%%X11%%%%DATADIR%%/flags/tuareg-shield-large.png
+%%X11%%%%DATADIR%%/flags/tuareg-shield.png
+%%X11%%%%DATADIR%%/flags/tuareg.png
 %%X11%%%%DATADIR%%/flags/tunisia-large.png
 %%X11%%%%DATADIR%%/flags/tunisia-shield-large.png
 %%X11%%%%DATADIR%%/flags/tunisia-shield.png
@@ -1646,10 +2222,30 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/vandal-shield-large.png
 %%X11%%%%DATADIR%%/flags/vandal-shield.png
 %%X11%%%%DATADIR%%/flags/vandal.png
+%%X11%%%%DATADIR%%/flags/vanuatu-large.png
+%%X11%%%%DATADIR%%/flags/vanuatu-shield-large.png
+%%X11%%%%DATADIR%%/flags/vanuatu-shield.png
+%%X11%%%%DATADIR%%/flags/vanuatu.png
 %%X11%%%%DATADIR%%/flags/vatican-large.png
 %%X11%%%%DATADIR%%/flags/vatican-shield-large.png
 %%X11%%%%DATADIR%%/flags/vatican-shield.png
 %%X11%%%%DATADIR%%/flags/vatican.png
+%%X11%%%%DATADIR%%/flags/vedic-large.png
+%%X11%%%%DATADIR%%/flags/vedic-shield-large.png
+%%X11%%%%DATADIR%%/flags/vedic-shield.png
+%%X11%%%%DATADIR%%/flags/vedic.png
+%%X11%%%%DATADIR%%/flags/veletian-large.png
+%%X11%%%%DATADIR%%/flags/veletian-shield-large.png
+%%X11%%%%DATADIR%%/flags/veletian-shield.png
+%%X11%%%%DATADIR%%/flags/veletian.png
+%%X11%%%%DATADIR%%/flags/venda-large.png
+%%X11%%%%DATADIR%%/flags/venda-shield-large.png
+%%X11%%%%DATADIR%%/flags/venda-shield.png
+%%X11%%%%DATADIR%%/flags/venda.png
+%%X11%%%%DATADIR%%/flags/venetic-large.png
+%%X11%%%%DATADIR%%/flags/venetic-shield-large.png
+%%X11%%%%DATADIR%%/flags/venetic-shield.png
+%%X11%%%%DATADIR%%/flags/venetic.png
 %%X11%%%%DATADIR%%/flags/venezuela-large.png
 %%X11%%%%DATADIR%%/flags/venezuela-shield-large.png
 %%X11%%%%DATADIR%%/flags/venezuela-shield.png
@@ -1674,6 +2270,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/visigoth-shield-large.png
 %%X11%%%%DATADIR%%/flags/visigoth-shield.png
 %%X11%%%%DATADIR%%/flags/visigoth.png
+%%X11%%%%DATADIR%%/flags/vistulan-large.png
+%%X11%%%%DATADIR%%/flags/vistulan-shield-large.png
+%%X11%%%%DATADIR%%/flags/vistulan-shield.png
+%%X11%%%%DATADIR%%/flags/vistulan.png
+%%X11%%%%DATADIR%%/flags/volapuk-large.png
+%%X11%%%%DATADIR%%/flags/volapuk-shield-large.png
+%%X11%%%%DATADIR%%/flags/volapuk-shield.png
+%%X11%%%%DATADIR%%/flags/volapuk.png
+%%X11%%%%DATADIR%%/flags/volga_bulgar-large.png
+%%X11%%%%DATADIR%%/flags/volga_bulgar-shield-large.png
+%%X11%%%%DATADIR%%/flags/volga_bulgar-shield.png
+%%X11%%%%DATADIR%%/flags/volga_bulgar.png
+%%X11%%%%DATADIR%%/flags/volga_german-large.png
+%%X11%%%%DATADIR%%/flags/volga_german-shield-large.png
+%%X11%%%%DATADIR%%/flags/volga_german-shield.png
+%%X11%%%%DATADIR%%/flags/volga_german.png
 %%X11%%%%DATADIR%%/flags/wales-large.png
 %%X11%%%%DATADIR%%/flags/wales-shield-large.png
 %%X11%%%%DATADIR%%/flags/wales-shield.png
@@ -1686,6 +2298,10 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/west_indies_federation-shield-large.png
 %%X11%%%%DATADIR%%/flags/west_indies_federation-shield.png
 %%X11%%%%DATADIR%%/flags/west_indies_federation.png
+%%X11%%%%DATADIR%%/flags/west_papua-large.png
+%%X11%%%%DATADIR%%/flags/west_papua-shield-large.png
+%%X11%%%%DATADIR%%/flags/west_papua-shield.png
+%%X11%%%%DATADIR%%/flags/west_papua.png
 %%X11%%%%DATADIR%%/flags/westphalia-large.png
 %%X11%%%%DATADIR%%/flags/westphalia-shield-large.png
 %%X11%%%%DATADIR%%/flags/westphalia-shield.png
@@ -1694,6 +2310,14 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/wuerttemberg-shield-large.png
 %%X11%%%%DATADIR%%/flags/wuerttemberg-shield.png
 %%X11%%%%DATADIR%%/flags/wuerttemberg.png
+%%X11%%%%DATADIR%%/flags/xhosa-large.png
+%%X11%%%%DATADIR%%/flags/xhosa-shield-large.png
+%%X11%%%%DATADIR%%/flags/xhosa-shield.png
+%%X11%%%%DATADIR%%/flags/xhosa.png
+%%X11%%%%DATADIR%%/flags/xiongnu-large.png
+%%X11%%%%DATADIR%%/flags/xiongnu-shield-large.png
+%%X11%%%%DATADIR%%/flags/xiongnu-shield.png
+%%X11%%%%DATADIR%%/flags/xiongnu.png
 %%X11%%%%DATADIR%%/flags/yemen-large.png
 %%X11%%%%DATADIR%%/flags/yemen-shield-large.png
 %%X11%%%%DATADIR%%/flags/yemen-shield.png
@@ -1706,10 +2330,22 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/flags/yugoslavia-shield-large.png
 %%X11%%%%DATADIR%%/flags/yugoslavia-shield.png
 %%X11%%%%DATADIR%%/flags/yugoslavia.png
+%%X11%%%%DATADIR%%/flags/zambia-large.png
+%%X11%%%%DATADIR%%/flags/zambia-shield-large.png
+%%X11%%%%DATADIR%%/flags/zambia-shield.png
+%%X11%%%%DATADIR%%/flags/zambia.png
+%%X11%%%%DATADIR%%/flags/zanzibar-large.png
+%%X11%%%%DATADIR%%/flags/zanzibar-shield-large.png
+%%X11%%%%DATADIR%%/flags/zanzibar-shield.png
+%%X11%%%%DATADIR%%/flags/zanzibar.png
 %%X11%%%%DATADIR%%/flags/zapotec-large.png
 %%X11%%%%DATADIR%%/flags/zapotec-shield-large.png
 %%X11%%%%DATADIR%%/flags/zapotec-shield.png
 %%X11%%%%DATADIR%%/flags/zapotec.png
+%%X11%%%%DATADIR%%/flags/zhuang-large.png
+%%X11%%%%DATADIR%%/flags/zhuang-shield-large.png
+%%X11%%%%DATADIR%%/flags/zhuang-shield.png
+%%X11%%%%DATADIR%%/flags/zhuang.png
 %%X11%%%%DATADIR%%/flags/zimbabwe-large.png
 %%X11%%%%DATADIR%%/flags/zimbabwe-shield-large.png
 %%X11%%%%DATADIR%%/flags/zimbabwe-shield.png
@@ -1773,8 +2409,6 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/misc/citybar.spec
 %%X11%%%%DATADIR%%/misc/cityicon.png
 %%X11%%%%DATADIR%%/misc/civicon.png
-%%X11%%%%DATADIR%%/misc/colors.png
-%%X11%%%%DATADIR%%/misc/colors.spec
 %%X11%%%%DATADIR%%/misc/colors.tilespec
 %%X11%%%%DATADIR%%/misc/cursors.png
 %%X11%%%%DATADIR%%/misc/cursors.spec
@@ -1803,31 +2437,39 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/multiplayer/buildings.ruleset
 %%DATADIR%%/multiplayer/cities.ruleset
 %%DATADIR%%/multiplayer/effects.ruleset
-%%DATADIR%%/multiplayer/script.lua
 %%DATADIR%%/multiplayer/game.ruleset
 %%DATADIR%%/multiplayer/governments.ruleset
+%%DATADIR%%/multiplayer/script.lua
 %%DATADIR%%/multiplayer/techs.ruleset
 %%DATADIR%%/multiplayer/terrain.ruleset
 %%DATADIR%%/multiplayer/units.ruleset
 %%DATADIR%%/multiplayer.serv
 %%DATADIR%%/nation/abkhaz.ruleset
 %%DATADIR%%/nation/aborigines.ruleset
+%%DATADIR%%/nation/abyssinian.ruleset
 %%DATADIR%%/nation/acadian.ruleset
 %%DATADIR%%/nation/acehnese.ruleset
+%%DATADIR%%/nation/acrean.ruleset
 %%DATADIR%%/nation/afghani.ruleset
+%%DATADIR%%/nation/african.ruleset
 %%DATADIR%%/nation/ainu.ruleset
 %%DATADIR%%/nation/akwe.ruleset
 %%DATADIR%%/nation/alandalus.ruleset
+%%DATADIR%%/nation/alander.ruleset
 %%DATADIR%%/nation/albanian.ruleset
 %%DATADIR%%/nation/aleut.ruleset
 %%DATADIR%%/nation/algerian.ruleset
+%%DATADIR%%/nation/alsatian.ruleset
 %%DATADIR%%/nation/amazigh.ruleset
 %%DATADIR%%/nation/amazonian.ruleset
 %%DATADIR%%/nation/american.ruleset
 %%DATADIR%%/nation/andorran.ruleset
 %%DATADIR%%/nation/angolan.ruleset
+%%DATADIR%%/nation/anhaltian.ruleset
 %%DATADIR%%/nation/anishinaabe.ruleset
 %%DATADIR%%/nation/antarctican.ruleset
+%%DATADIR%%/nation/antiguan.ruleset
+%%DATADIR%%/nation/antillean.ruleset
 %%DATADIR%%/nation/apache.ruleset
 %%DATADIR%%/nation/arab.ruleset
 %%DATADIR%%/nation/aragonese.ruleset
@@ -1835,77 +2477,113 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/argentine.ruleset
 %%DATADIR%%/nation/armenian.ruleset
 %%DATADIR%%/nation/ashanti.ruleset
+%%DATADIR%%/nation/assamese.ruleset
 %%DATADIR%%/nation/assyrian.ruleset
 %%DATADIR%%/nation/asturian.ruleset
 %%DATADIR%%/nation/atlantean.ruleset
 %%DATADIR%%/nation/australian.ruleset
 %%DATADIR%%/nation/austrian.ruleset
+%%DATADIR%%/nation/avar.ruleset
 %%DATADIR%%/nation/aymara.ruleset
 %%DATADIR%%/nation/azeri.ruleset
 %%DATADIR%%/nation/aztec.ruleset
 %%DATADIR%%/nation/babylonian.ruleset
 %%DATADIR%%/nation/badian.ruleset
+%%DATADIR%%/nation/bahamian.ruleset
+%%DATADIR%%/nation/bahraini.ruleset
+%%DATADIR%%/nation/bangladeshi.ruleset
+%%DATADIR%%/nation/barbadian.ruleset
 %%DATADIR%%/nation/barbarian.ruleset
 %%DATADIR%%/nation/bashkir.ruleset
 %%DATADIR%%/nation/basque.ruleset
 %%DATADIR%%/nation/bavarian.ruleset
 %%DATADIR%%/nation/belarusian.ruleset
 %%DATADIR%%/nation/belgian.ruleset
+%%DATADIR%%/nation/belgic.ruleset
+%%DATADIR%%/nation/belizean.ruleset
 %%DATADIR%%/nation/bengali.ruleset
 %%DATADIR%%/nation/benin.ruleset
+%%DATADIR%%/nation/beninese.ruleset
 %%DATADIR%%/nation/bhutanese.ruleset
 %%DATADIR%%/nation/biafran.ruleset
+%%DATADIR%%/nation/bissauguinean.ruleset
 %%DATADIR%%/nation/boer.ruleset
+%%DATADIR%%/nation/boian.ruleset
 %%DATADIR%%/nation/bolivian.ruleset
 %%DATADIR%%/nation/bosnia.ruleset
 %%DATADIR%%/nation/bosporan.ruleset
+%%DATADIR%%/nation/botswanan.ruleset
 %%DATADIR%%/nation/brandenburgian.ruleset
 %%DATADIR%%/nation/brazilian.ruleset
 %%DATADIR%%/nation/breton.ruleset
 %%DATADIR%%/nation/british.ruleset
 %%DATADIR%%/nation/briton.ruleset
+%%DATADIR%%/nation/bruneian.ruleset
 %%DATADIR%%/nation/bulgarian.ruleset
 %%DATADIR%%/nation/burgundian.ruleset
 %%DATADIR%%/nation/burkinabe.ruleset
 %%DATADIR%%/nation/burmese.ruleset
 %%DATADIR%%/nation/burundi.ruleset
+%%DATADIR%%/nation/buryat.ruleset
 %%DATADIR%%/nation/byzantium.ruleset
 %%DATADIR%%/nation/californian.ruleset
 %%DATADIR%%/nation/cambodian.ruleset
 %%DATADIR%%/nation/cameroonian.ruleset
 %%DATADIR%%/nation/canadian.ruleset
+%%DATADIR%%/nation/canari.ruleset
+%%DATADIR%%/nation/cantonese.ruleset
+%%DATADIR%%/nation/capeverdean.ruleset
 %%DATADIR%%/nation/carthaginian.ruleset
 %%DATADIR%%/nation/castilian.ruleset
 %%DATADIR%%/nation/catalan.ruleset
 %%DATADIR%%/nation/celtiberian.ruleset
+%%DATADIR%%/nation/celtic.ruleset
 %%DATADIR%%/nation/centralafrican.ruleset
 %%DATADIR%%/nation/centralamerican.ruleset
+%%DATADIR%%/nation/centrallithuanian.ruleset
+%%DATADIR%%/nation/chadian.ruleset
 %%DATADIR%%/nation/cham.ruleset
 %%DATADIR%%/nation/chananean.ruleset
 %%DATADIR%%/nation/chechen.ruleset
 %%DATADIR%%/nation/cherokee.ruleset
+%%DATADIR%%/nation/chiapanec.ruleset
+%%DATADIR%%/nation/chickasaw.ruleset
 %%DATADIR%%/nation/chilean.ruleset
 %%DATADIR%%/nation/chimu.ruleset
 %%DATADIR%%/nation/chinese.ruleset
+%%DATADIR%%/nation/chinook.ruleset
+%%DATADIR%%/nation/choctaw.ruleset
 %%DATADIR%%/nation/chola.ruleset
+%%DATADIR%%/nation/chrobatian.ruleset
 %%DATADIR%%/nation/chumash.ruleset
+%%DATADIR%%/nation/chuvash.ruleset
+%%DATADIR%%/nation/circassian.ruleset
 %%DATADIR%%/nation/colombian.ruleset
 %%DATADIR%%/nation/comanche.ruleset
+%%DATADIR%%/nation/comorian.ruleset
 %%DATADIR%%/nation/confederate.ruleset
 %%DATADIR%%/nation/congolese.ruleset
+%%DATADIR%%/nation/congolesebrazzaville.ruleset
 %%DATADIR%%/nation/cornish.ruleset
 %%DATADIR%%/nation/corsican.ruleset
 %%DATADIR%%/nation/cossack.ruleset
 %%DATADIR%%/nation/costarican.ruleset
 %%DATADIR%%/nation/cree.ruleset
+%%DATADIR%%/nation/cretan.ruleset
 %%DATADIR%%/nation/crimeantatar.ruleset
 %%DATADIR%%/nation/croatian.ruleset
+%%DATADIR%%/nation/crusader.ruleset
 %%DATADIR%%/nation/cuban.ruleset
 %%DATADIR%%/nation/curonian.ruleset
+%%DATADIR%%/nation/cuyavian.ruleset
 %%DATADIR%%/nation/cypriot.ruleset
+%%DATADIR%%/nation/cyrenaican.ruleset
 %%DATADIR%%/nation/czech.ruleset
+%%DATADIR%%/nation/czechoslovak.ruleset
 %%DATADIR%%/nation/dahomean.ruleset
 %%DATADIR%%/nation/danish.ruleset
+%%DATADIR%%/nation/darfuri.ruleset
+%%DATADIR%%/nation/djiboutian.ruleset
 %%DATADIR%%/nation/dominican.ruleset
 %%DATADIR%%/nation/dominicano.ruleset
 %%DATADIR%%/nation/dryad.ruleset
@@ -1918,26 +2596,43 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/elamite.ruleset
 %%DATADIR%%/nation/emirati.ruleset
 %%DATADIR%%/nation/english.ruleset
+%%DATADIR%%/nation/epirote.ruleset
+%%DATADIR%%/nation/equatoguinean.ruleset
 %%DATADIR%%/nation/eritrean.ruleset
 %%DATADIR%%/nation/esperant.ruleset
 %%DATADIR%%/nation/estonian.ruleset
 %%DATADIR%%/nation/ethiopian.ruleset
 %%DATADIR%%/nation/etruscan.ruleset
 %%DATADIR%%/nation/european.ruleset
+%%DATADIR%%/nation/evenki.ruleset
+%%DATADIR%%/nation/faroese.ruleset
 %%DATADIR%%/nation/fijian.ruleset
 %%DATADIR%%/nation/filipino.ruleset
 %%DATADIR%%/nation/finnish.ruleset
 %%DATADIR%%/nation/flemish.ruleset
+%%DATADIR%%/nation/florentine.ruleset
 %%DATADIR%%/nation/franconian.ruleset
+%%DATADIR%%/nation/frankish.ruleset
 %%DATADIR%%/nation/french.ruleset
 %%DATADIR%%/nation/frisian.ruleset
+%%DATADIR%%/nation/friulian.ruleset
+%%DATADIR%%/nation/fulani.ruleset
+%%DATADIR%%/nation/gabonese.ruleset
 %%DATADIR%%/nation/gaelic.ruleset
 %%DATADIR%%/nation/galician.ruleset
 %%DATADIR%%/nation/gallic.ruleset
+%%DATADIR%%/nation/gambian.ruleset
+%%DATADIR%%/nation/genoese.ruleset
 %%DATADIR%%/nation/georgian.ruleset
 %%DATADIR%%/nation/german.ruleset
+%%DATADIR%%/nation/germanbelgian.ruleset
+%%DATADIR%%/nation/germanic.ruleset
+%%DATADIR%%/nation/ghana.ruleset
 %%DATADIR%%/nation/ghanaian.ruleset
+%%DATADIR%%/nation/ghaznavid.ruleset
 %%DATADIR%%/nation/gokturk.ruleset
+%%DATADIR%%/nation/goldenhorde.ruleset
+%%DATADIR%%/nation/gothic.ruleset
 %%DATADIR%%/nation/greaterpolish.ruleset
 %%DATADIR%%/nation/greek.ruleset
 %%DATADIR%%/nation/greenlander.ruleset
@@ -1945,6 +2640,7 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/guanche.ruleset
 %%DATADIR%%/nation/guarani.ruleset
 %%DATADIR%%/nation/guatemalan.ruleset
+%%DATADIR%%/nation/guinean.ruleset
 %%DATADIR%%/nation/gupta.ruleset
 %%DATADIR%%/nation/guyanese.ruleset
 %%DATADIR%%/nation/hacker.ruleset
@@ -1955,6 +2651,8 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/hasinay.ruleset
 %%DATADIR%%/nation/hawaiian.ruleset
 %%DATADIR%%/nation/hellenic.ruleset
+%%DATADIR%%/nation/helvetian.ruleset
+%%DATADIR%%/nation/hephthalite.ruleset
 %%DATADIR%%/nation/hessian.ruleset
 %%DATADIR%%/nation/himyarite.ruleset
 %%DATADIR%%/nation/hittite.ruleset
@@ -1963,11 +2661,13 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/honduran.ruleset
 %%DATADIR%%/nation/hopi.ruleset
 %%DATADIR%%/nation/hungarian.ruleset
+%%DATADIR%%/nation/hunnic.ruleset
 %%DATADIR%%/nation/iberian.ruleset
 %%DATADIR%%/nation/icelandic.ruleset
 %%DATADIR%%/nation/illyrian.ruleset
 %%DATADIR%%/nation/inca.ruleset
 %%DATADIR%%/nation/indian.ruleset
+%%DATADIR%%/nation/indoeuropean.ruleset
 %%DATADIR%%/nation/indonesian.ruleset
 %%DATADIR%%/nation/inuit.ruleset
 %%DATADIR%%/nation/iranian.ruleset
@@ -1975,36 +2675,54 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/irish.ruleset
 %%DATADIR%%/nation/iroquois.ruleset
 %%DATADIR%%/nation/israeli.ruleset
+%%DATADIR%%/nation/israelite.ruleset
 %%DATADIR%%/nation/italian.ruleset
 %%DATADIR%%/nation/ivoirian.ruleset
+%%DATADIR%%/nation/jaffna.ruleset
 %%DATADIR%%/nation/jamaican.ruleset
 %%DATADIR%%/nation/japanese.ruleset
 %%DATADIR%%/nation/jolof.ruleset
+%%DATADIR%%/nation/jordanian.ruleset
 %%DATADIR%%/nation/kalmyk.ruleset
 %%DATADIR%%/nation/kanem-bornu.ruleset
+%%DATADIR%%/nation/karabakhi.ruleset
 %%DATADIR%%/nation/karelian.ruleset
+%%DATADIR%%/nation/karen.ruleset
 %%DATADIR%%/nation/kashmiri.ruleset
+%%DATADIR%%/nation/kashubian.ruleset
+%%DATADIR%%/nation/katangan.ruleset
 %%DATADIR%%/nation/kazakh.ruleset
 %%DATADIR%%/nation/kenyan.ruleset
 %%DATADIR%%/nation/khazar.ruleset
+%%DATADIR%%/nation/khmer.ruleset
 %%DATADIR%%/nation/khwarezmian.ruleset
+%%DATADIR%%/nation/kiribati.ruleset
+%%DATADIR%%/nation/kittitian.ruleset
 %%DATADIR%%/nation/kongo.ruleset
 %%DATADIR%%/nation/korean.ruleset
 %%DATADIR%%/nation/kosovar.ruleset
+%%DATADIR%%/nation/kuna.ruleset
 %%DATADIR%%/nation/kurd.ruleset
+%%DATADIR%%/nation/kuwaiti.ruleset
 %%DATADIR%%/nation/kyrgyz.ruleset
 %%DATADIR%%/nation/lankese.ruleset
 %%DATADIR%%/nation/laotian.ruleset
+%%DATADIR%%/nation/latin.ruleset
 %%DATADIR%%/nation/latvian.ruleset
 %%DATADIR%%/nation/lebanese.ruleset
 %%DATADIR%%/nation/lendian.ruleset
 %%DATADIR%%/nation/leonese.ruleset
+%%DATADIR%%/nation/lesothoan.ruleset
+%%DATADIR%%/nation/liberian.ruleset
+%%DATADIR%%/nation/liburnian.ruleset
 %%DATADIR%%/nation/libyan.ruleset
 %%DATADIR%%/nation/liechtensteiner.ruleset
 %%DATADIR%%/nation/lipkatatar.ruleset
+%%DATADIR%%/nation/lippe.ruleset
 %%DATADIR%%/nation/lithuanian.ruleset
 %%DATADIR%%/nation/lojbanistani.ruleset
 %%DATADIR%%/nation/lorrain.ruleset
+%%DATADIR%%/nation/luwian.ruleset
 %%DATADIR%%/nation/luxembourgish.ruleset
 %%DATADIR%%/nation/maasai.ruleset
 %%DATADIR%%/nation/macedon.ruleset
@@ -2013,17 +2731,24 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/malagasy.ruleset
 %%DATADIR%%/nation/malawian.ruleset
 %%DATADIR%%/nation/malaysian.ruleset
+%%DATADIR%%/nation/maldivian.ruleset
 %%DATADIR%%/nation/mali.ruleset
 %%DATADIR%%/nation/malian.ruleset
 %%DATADIR%%/nation/maltese.ruleset
+%%DATADIR%%/nation/mamluk.ruleset
 %%DATADIR%%/nation/manchu.ruleset
 %%DATADIR%%/nation/manx.ruleset
 %%DATADIR%%/nation/maori.ruleset
 %%DATADIR%%/nation/mapuche.ruleset
+%%DATADIR%%/nation/marathi.ruleset
 %%DATADIR%%/nation/martian.ruleset
+%%DATADIR%%/nation/mauritanian.ruleset
+%%DATADIR%%/nation/mauritian.ruleset
 %%DATADIR%%/nation/mayan.ruleset
 %%DATADIR%%/nation/mazovian.ruleset
 %%DATADIR%%/nation/mecklenburgian.ruleset
+%%DATADIR%%/nation/median.ruleset
+%%DATADIR%%/nation/messapian.ruleset
 %%DATADIR%%/nation/metis.ruleset
 %%DATADIR%%/nation/mexican.ruleset
 %%DATADIR%%/nation/miao.ruleset
@@ -2031,22 +2756,27 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/mikmaq.ruleset
 %%DATADIR%%/nation/milanese.ruleset
 %%DATADIR%%/nation/miskito.ruleset
+%%DATADIR%%/nation/mitanni.ruleset
 %%DATADIR%%/nation/mixtec.ruleset
 %%DATADIR%%/nation/moldovan.ruleset
+%%DATADIR%%/nation/moluccan.ruleset
+%%DATADIR%%/nation/mon.ruleset
 %%DATADIR%%/nation/monegasque.ruleset
 %%DATADIR%%/nation/mongol.ruleset
 %%DATADIR%%/nation/montenegrin.ruleset
 %%DATADIR%%/nation/moravian.ruleset
 %%DATADIR%%/nation/mordvin.ruleset
 %%DATADIR%%/nation/moroccan.ruleset
-%%DATADIR%%/nation/motswana.ruleset
 %%DATADIR%%/nation/mozambican.ruleset
 %%DATADIR%%/nation/mughal.ruleset
+%%DATADIR%%/nation/muscovite.ruleset
 %%DATADIR%%/nation/muskogee.ruleset
 %%DATADIR%%/nation/mwiska.ruleset
 %%DATADIR%%/nation/namibian.ruleset
+%%DATADIR%%/nation/nauruan.ruleset
 %%DATADIR%%/nation/navajo.ruleset
 %%DATADIR%%/nation/neapolitan.ruleset
+%%DATADIR%%/nation/nenets.ruleset
 %%DATADIR%%/nation/nepali.ruleset
 %%DATADIR%%/nation/nestorian.ruleset
 %%DATADIR%%/nation/newfoundland.ruleset
@@ -2065,89 +2795,126 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/occitan.ruleset
 %%DATADIR%%/nation/ohlone.ruleset
 %%DATADIR%%/nation/oldenburgian.ruleset
+%%DATADIR%%/nation/oldprussian.ruleset
 %%DATADIR%%/nation/omani.ruleset
 %%DATADIR%%/nation/ossetian.ruleset
 %%DATADIR%%/nation/ostrogothic.ruleset
 %%DATADIR%%/nation/otomi.ruleset
 %%DATADIR%%/nation/ottoman.ruleset
 %%DATADIR%%/nation/ozite.ruleset
+%%DATADIR%%/nation/paeonian.ruleset
 %%DATADIR%%/nation/pakistani.ruleset
 %%DATADIR%%/nation/palatinate.ruleset
 %%DATADIR%%/nation/palestinian.ruleset
 %%DATADIR%%/nation/palmyrene.ruleset
 %%DATADIR%%/nation/panamanian.ruleset
 %%DATADIR%%/nation/papuan.ruleset
+%%DATADIR%%/nation/papuanewguinean.ruleset
 %%DATADIR%%/nation/paraguayan.ruleset
+%%DATADIR%%/nation/parthian.ruleset
 %%DATADIR%%/nation/pashtun.ruleset
+%%DATADIR%%/nation/pelasgian.ruleset
 %%DATADIR%%/nation/persian.ruleset
 %%DATADIR%%/nation/peruvian.ruleset
 %%DATADIR%%/nation/phoenician.ruleset
+%%DATADIR%%/nation/phrygian.ruleset
+%%DATADIR%%/nation/pictish.ruleset
 %%DATADIR%%/nation/piedmontese.ruleset
 %%DATADIR%%/nation/pirate.ruleset
 %%DATADIR%%/nation/polish.ruleset
 %%DATADIR%%/nation/polynesian.ruleset
+%%DATADIR%%/nation/pontic.ruleset
 %%DATADIR%%/nation/portuguese.ruleset
 %%DATADIR%%/nation/prussian.ruleset
 %%DATADIR%%/nation/puertorican.ruleset
 %%DATADIR%%/nation/purhepecha.ruleset
+%%DATADIR%%/nation/qatari.ruleset
 %%DATADIR%%/nation/quebecois.ruleset
+%%DATADIR%%/nation/rapanui.ruleset
 %%DATADIR%%/nation/raramuri.ruleset
+%%DATADIR%%/nation/rhenish.ruleset
 %%DATADIR%%/nation/riffian.ruleset
 %%DATADIR%%/nation/riograndense.ruleset
 %%DATADIR%%/nation/roman.ruleset
 %%DATADIR%%/nation/romanian.ruleset
+%%DATADIR%%/nation/romansh.ruleset
 %%DATADIR%%/nation/russian.ruleset
 %%DATADIR%%/nation/ruthenian.ruleset
 %%DATADIR%%/nation/rwandan.ruleset
 %%DATADIR%%/nation/ryukyuan.ruleset
+%%DATADIR%%/nation/sabine.ruleset
 %%DATADIR%%/nation/sahrawi.ruleset
+%%DATADIR%%/nation/saintlucian.ruleset
+%%DATADIR%%/nation/saka.ruleset
+%%DATADIR%%/nation/salishan.ruleset
 %%DATADIR%%/nation/salvadoran.ruleset
 %%DATADIR%%/nation/sami.ruleset
 %%DATADIR%%/nation/sammarinese.ruleset
+%%DATADIR%%/nation/samnite.ruleset
+%%DATADIR%%/nation/samoan.ruleset
 %%DATADIR%%/nation/samogitian.ruleset
+%%DATADIR%%/nation/santomean.ruleset
+%%DATADIR%%/nation/sardinian.ruleset
 %%DATADIR%%/nation/sarmatian.ruleset
 %%DATADIR%%/nation/saudi.ruleset
 %%DATADIR%%/nation/savoyard.ruleset
 %%DATADIR%%/nation/saxon.ruleset
+%%DATADIR%%/nation/scanian.ruleset
 %%DATADIR%%/nation/schleswig-holsteinian.ruleset
 %%DATADIR%%/nation/scottish.ruleset
+%%DATADIR%%/nation/scottishgaelic.ruleset
 %%DATADIR%%/nation/scythian.ruleset
 %%DATADIR%%/nation/seleucid.ruleset
+%%DATADIR%%/nation/seljuk.ruleset
+%%DATADIR%%/nation/seminole.ruleset
 %%DATADIR%%/nation/senegalese.ruleset
 %%DATADIR%%/nation/serbian.ruleset
+%%DATADIR%%/nation/seychellois.ruleset
+%%DATADIR%%/nation/shan.ruleset
 %%DATADIR%%/nation/shawnee.ruleset
+%%DATADIR%%/nation/sherpa.ruleset
 %%DATADIR%%/nation/siberian.ruleset
 %%DATADIR%%/nation/sicilian.ruleset
+%%DATADIR%%/nation/sierraleonean.ruleset
 %%DATADIR%%/nation/sikh.ruleset
 %%DATADIR%%/nation/sikkimese.ruleset
 %%DATADIR%%/nation/silesian.ruleset
 %%DATADIR%%/nation/singaporean.ruleset
+%%DATADIR%%/nation/sinhalese.ruleset
 %%DATADIR%%/nation/sioux.ruleset
 %%DATADIR%%/nation/slavic.ruleset
 %%DATADIR%%/nation/slovakian.ruleset
 %%DATADIR%%/nation/slovenian.ruleset
+%%DATADIR%%/nation/solomonislander.ruleset
 %%DATADIR%%/nation/somali.ruleset
+%%DATADIR%%/nation/somaliland.ruleset
 %%DATADIR%%/nation/songhai.ruleset
 %%DATADIR%%/nation/sorbian.ruleset
+%%DATADIR%%/nation/sotho.ruleset
 %%DATADIR%%/nation/southafrican.ruleset
 %%DATADIR%%/nation/southamerican.ruleset
 %%DATADIR%%/nation/southkorean.ruleset
+%%DATADIR%%/nation/southsudanese.ruleset
 %%DATADIR%%/nation/southvietnamese.ruleset
 %%DATADIR%%/nation/southyemeni.ruleset
 %%DATADIR%%/nation/soviet.ruleset
 %%DATADIR%%/nation/spanish.ruleset
 %%DATADIR%%/nation/srivijaya.ruleset
 %%DATADIR%%/nation/sudanese.ruleset
+%%DATADIR%%/nation/suebian.ruleset
 %%DATADIR%%/nation/sumerian.ruleset
 %%DATADIR%%/nation/surinamese.ruleset
+%%DATADIR%%/nation/swahili.ruleset
 %%DATADIR%%/nation/swazi.ruleset
 %%DATADIR%%/nation/swedish.ruleset
 %%DATADIR%%/nation/swiss.ruleset
 %%DATADIR%%/nation/syrian.ruleset
+%%DATADIR%%/nation/tahitian.ruleset
 %%DATADIR%%/nation/taino.ruleset
 %%DATADIR%%/nation/tairona.ruleset
 %%DATADIR%%/nation/taiwanese.ruleset
 %%DATADIR%%/nation/tajik.ruleset
+%%DATADIR%%/nation/tanganyikan.ruleset
 %%DATADIR%%/nation/tanzanian.ruleset
 %%DATADIR%%/nation/tatar.ruleset
 %%DATADIR%%/nation/templar.ruleset
@@ -2155,16 +2922,22 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/texan.ruleset
 %%DATADIR%%/nation/thai.ruleset
 %%DATADIR%%/nation/thracian.ruleset
+%%DATADIR%%/nation/thuringian.ruleset
 %%DATADIR%%/nation/tibetan.ruleset
 %%DATADIR%%/nation/timurid.ruleset
 %%DATADIR%%/nation/tocharian.ruleset
 %%DATADIR%%/nation/togolese.ruleset
 %%DATADIR%%/nation/toltec.ruleset
 %%DATADIR%%/nation/tongan.ruleset
+%%DATADIR%%/nation/transnistrian.ruleset
 %%DATADIR%%/nation/transylvanian.ruleset
+%%DATADIR%%/nation/trinidadian.ruleset
+%%DATADIR%%/nation/tswana.ruleset
+%%DATADIR%%/nation/tuareg.ruleset
 %%DATADIR%%/nation/tunisian.ruleset
 %%DATADIR%%/nation/tupi.ruleset
 %%DATADIR%%/nation/turk.ruleset
+%%DATADIR%%/nation/turkishcypriot.ruleset
 %%DATADIR%%/nation/turkmen.ruleset
 %%DATADIR%%/nation/tuvan.ruleset
 %%DATADIR%%/nation/tyrolian.ruleset
@@ -2176,44 +2949,56 @@ share/applications/freeciv-server.desktop
 %%DATADIR%%/nation/uzbek.ruleset
 %%DATADIR%%/nation/vampire.ruleset
 %%DATADIR%%/nation/vandalic.ruleset
+%%DATADIR%%/nation/vanuatuan.ruleset
+%%DATADIR%%/nation/vedic.ruleset
+%%DATADIR%%/nation/veletian.ruleset
+%%DATADIR%%/nation/venda.ruleset
 %%DATADIR%%/nation/venetian.ruleset
+%%DATADIR%%/nation/venetic.ruleset
 %%DATADIR%%/nation/venezuelan.ruleset
 %%DATADIR%%/nation/vermont.ruleset
 %%DATADIR%%/nation/vietnamese.ruleset
 %%DATADIR%%/nation/viking.ruleset
 %%DATADIR%%/nation/vincentian.ruleset
 %%DATADIR%%/nation/visigothic.ruleset
+%%DATADIR%%/nation/vistulan.ruleset
+%%DATADIR%%/nation/volapuk.ruleset
+%%DATADIR%%/nation/volgabulgar.ruleset
+%%DATADIR%%/nation/volgagerman.ruleset
 %%DATADIR%%/nation/walloon.ruleset
 %%DATADIR%%/nation/welsh.ruleset
+%%DATADIR%%/nation/werewolf.ruleset
 %%DATADIR%%/nation/westernpomeranian.ruleset
 %%DATADIR%%/nation/westernroman.ruleset
 %%DATADIR%%/nation/westindian.ruleset
 %%DATADIR%%/nation/westphalian.ruleset
 %%DATADIR%%/nation/wuerttembergian.ruleset
+%%DATADIR%%/nation/xhosa.ruleset
+%%DATADIR%%/nation/xiongnu.ruleset
 %%DATADIR%%/nation/yakut.ruleset
 %%DATADIR%%/nation/yemeni.ruleset
 %%DATADIR%%/nation/yucatecan.ruleset
 %%DATADIR%%/nation/yugoslav.ruleset
+%%DATADIR%%/nation/zambian.ruleset
+%%DATADIR%%/nation/zanzibari.ruleset
 %%DATADIR%%/nation/zapotec.ruleset
+%%DATADIR%%/nation/zhuang.ruleset
 %%DATADIR%%/nation/zimbabwean.ruleset
 %%DATADIR%%/nation/zulu.ruleset
-%%DATADIR%%/scenario/british-isles-85x80-v2.80.sav.gz
-%%DATADIR%%/scenario/earth-160x90-v2.sav.gz
-%%DATADIR%%/scenario/earth-80x50-v3.sav.gz
-%%DATADIR%%/scenario/europe-200x100-v2.sav.gz
-%%DATADIR%%/scenario/france-140x90-v2.sav.gz
-%%DATADIR%%/scenario/hagworld-120x60-v1.2.sav.gz
-%%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav.gz
-%%DATADIR%%/scenario/italy-100x100-v1.5.sav.gz
-%%DATADIR%%/scenario/japan-88x100-v1.3.sav.gz
-%%DATADIR%%/scenario/north_america_116x100-v1.2.sav.gz
-%%DATADIR%%/scenario/tutorial.sav.gz
-%%X11%%%%DATADIR%%/stdsounds/foot3.ogg
-%%X11%%%%DATADIR%%/stdsounds/inh2o.ogg
+%%DATADIR%%/scenarios/british-isles-85x80-v2.80.sav.gz
+%%DATADIR%%/scenarios/earth-160x90-v2.sav.gz
+%%DATADIR%%/scenarios/earth-80x50-v3.sav.gz
+%%DATADIR%%/scenarios/europe-200x100-v2.sav.gz
+%%DATADIR%%/scenarios/france-140x90-v2.sav.gz
+%%DATADIR%%/scenarios/hagworld-120x60-v1.2.sav.gz
+%%DATADIR%%/scenarios/iberian-peninsula-136x100-v1.0.sav.gz
+%%DATADIR%%/scenarios/italy-100x100-v1.5.sav.gz
+%%DATADIR%%/scenarios/japan-88x100-v1.3.sav.gz
+%%DATADIR%%/scenarios/north_america_116x100-v1.2.sav.gz
+%%DATADIR%%/scenarios/tutorial.sav.gz
 %%X11%%%%DATADIR%%/stdsounds/LrgCan.ogg
 %%X11%%%%DATADIR%%/stdsounds/LrgExpl.ogg
 %%X11%%%%DATADIR%%/stdsounds/MedCan.ogg
-%%X11%%%%DATADIR%%/stdsounds/metbrk.ogg
 %%X11%%%%DATADIR%%/stdsounds/MgBar1.ogg
 %%X11%%%%DATADIR%%/stdsounds/MgBar2.ogg
 %%X11%%%%DATADIR%%/stdsounds/MgHeavy.ogg
@@ -2222,6 +3007,9 @@ share/applications/freeciv-server.desktop
 %%X11%%%%DATADIR%%/stdsounds/Splash.ogg
 %%X11%%%%DATADIR%%/stdsounds/THover.ogg
 %%X11%%%%DATADIR%%/stdsounds/Tread.ogg
+%%X11%%%%DATADIR%%/stdsounds/foot3.ogg
+%%X11%%%%DATADIR%%/stdsounds/inh2o.ogg
+%%X11%%%%DATADIR%%/stdsounds/metbrk.ogg
 %%X11%%%%DATADIR%%/stdsounds/wall01.ogg
 %%X11%%%%DATADIR%%/stdsounds/woodbrk.ogg
 %%X11%%%%DATADIR%%/stdsounds.soundspec
@@ -2426,15 +3214,15 @@ share/applications/freeciv-server.desktop
 %%X11%%share/icons/hicolor/32x32/apps/freeciv-client.png
 %%X11%%share/icons/hicolor/48x48/apps/freeciv-client.png
 %%X11%%share/icons/hicolor/64x64/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/128x128/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/16x16/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/32x32/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/48x48/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/64x64/apps/freeciv-modpack.png
+share/icons/hicolor/128x128/apps/freeciv-modpack.png
 share/icons/hicolor/128x128/apps/freeciv-server.png
+share/icons/hicolor/16x16/apps/freeciv-modpack.png
 share/icons/hicolor/16x16/apps/freeciv-server.png
+share/icons/hicolor/32x32/apps/freeciv-modpack.png
 share/icons/hicolor/32x32/apps/freeciv-server.png
+share/icons/hicolor/48x48/apps/freeciv-modpack.png
 share/icons/hicolor/48x48/apps/freeciv-server.png
+share/icons/hicolor/64x64/apps/freeciv-modpack.png
 share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv.mo
@@ -2454,6 +3242,7 @@ share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/id/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv.mo
@@ -2471,9 +3260,11 @@ share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv.mo
 %%X11%%share/pixmaps/freeciv-client.png
 %%X11%%@dirrm %%DATADIR%%/amplio2
 %%X11%%@dirrm %%DATADIR%%/buildings
+%%X11%%@dirrm %%DATADIR%%/cimpletoon
 @dirrm %%DATADIR%%/civ1
 @dirrm %%DATADIR%%/civ2
 @dirrm %%DATADIR%%/default
@@ -2485,7 +3276,7 @@ share/icons/hicolor/64x64/apps/freeciv-server.png
 %%X11%%@dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%/multiplayer
 @dirrm %%DATADIR%%/nation
-@dirrm %%DATADIR%%/scenario
+@dirrm %%DATADIR%%/scenarios
 %%X11%%@dirrm %%DATADIR%%/stdsounds
 %%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
 %%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
@@ -2514,6 +3305,19 @@ share/icons/hicolor/64x64/apps/freeciv-server.png
 %%X11%%@dirrm %%DATADIR%%/trident
 %%X11%%@dirrm %%DATADIR%%/wonders
 @dirrmtry %%DATADIR%%
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 %%NLS%%@dirrm share/locale/gd/LC_MESSAGES
 %%NLS%%@dirrm share/locale/gd
 @dirrmtry share/applications
+@dirrmtry etc/freeciv