From 41d6a853b6cd7bb5d7cd3c736ad8ebaea7368d92 Mon Sep 17 00:00:00 2001 From: Jean-Marc Leroy Date: Mon, 3 Feb 2020 14:19:20 +0100 Subject: [PATCH 28/28] Create liege.ruleset Additions by Marko Lindqvist: - Update the style - Include nation from default/nationlist.ruleset - Collect translatable strings from the ruleset - Install the nation (both autotools and meson builds) - Add flag from Wikimedia Commons See osdn #46553 --- data/default/nationlist.ruleset | 1 + data/flags/Makefile.am | 5 ++ data/flags/luik-large.png | Bin 0 -> 382 bytes data/flags/luik-shield-large.png | Bin 0 -> 368 bytes data/flags/luik-shield.png | Bin 0 -> 351 bytes data/flags/luik.png | Bin 0 -> 384 bytes data/flags/luik.svg | 87 +++++++++++++++++++++++++++++++ data/misc/flags-large.spec | 1 + data/misc/flags.spec | 2 + data/misc/shields-large.spec | 1 + data/misc/shields.spec | 1 + data/nation/Makefile.am | 1 + data/nation/liege.ruleset | 77 +++++++++++++++++++++++++++ meson.build | 1 + translations/nations/POTFILES.in | 1 + 15 files changed, 178 insertions(+) create mode 100644 data/flags/luik-large.png create mode 100644 data/flags/luik-shield-large.png create mode 100644 data/flags/luik-shield.png create mode 100644 data/flags/luik.png create mode 100644 data/flags/luik.svg create mode 100644 data/nation/liege.ruleset diff --git a/data/default/nationlist.ruleset b/data/default/nationlist.ruleset index 8bc8ec5c65..f598e9bc39 100644 --- a/data/default/nationlist.ruleset +++ b/data/default/nationlist.ruleset @@ -405,6 +405,7 @@ default_nationset = "all" *include "nation/liburnian.ruleset" *include "nation/libyan.ruleset" *include "nation/liechtensteiner.ruleset" +*include "nation/liege.ruleset" *include "nation/ligurian.ruleset" *include "nation/lipkatatar.ruleset" *include "nation/lippe.ruleset" diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am index a7727de0a9..732f46edfd 100644 --- a/data/flags/Makefile.am +++ b/data/flags/Makefile.am @@ -295,6 +295,7 @@ flag_files = \ lippe.png \ lithuania.png \ lorraine.png \ + luik.png \ luna.png \ lusatia.png \ luwian.png \ @@ -864,6 +865,7 @@ flag_files = \ lippe-large.png \ lithuania-large.png \ lorraine-large.png \ + luik-large.png \ luna-large.png \ lusatia-large.png \ luwian-large.png \ @@ -1435,6 +1437,7 @@ shield_files = \ lippe-shield.png \ lithuania-shield.png \ lorraine-shield.png \ + luik-shield.png \ luna-shield.png \ lusatia-shield.png \ luwian-shield.png \ @@ -2004,6 +2007,7 @@ shield_files = \ lippe-shield-large.png \ lithuania-shield-large.png \ lorraine-shield-large.png \ + luik-shield-large.png \ luna-shield-large.png \ lusatia-shield-large.png \ luwian-shield-large.png \ @@ -2575,6 +2579,7 @@ svg_files = \ lippe.svg \ lithuania.svg \ lorraine.svg \ + luik.svg \ luna.svg \ lusatia.svg \ luwian.svg \ diff --git a/data/flags/luik-large.png b/data/flags/luik-large.png new file mode 100644 index 0000000000000000000000000000000000000000..faf6c08041ffd20c8689513ca3e01a6c9bd9ba0d GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^IzTMP#0(_0B1BAp6id3JuOkD)#(wTUiL5}rLb6AY zF9SoB8UsT^3j@P1pisjL28L1t28LG&3=CE?7#PG0=Ijcz0ZQ-$_=LCu>03flf9`Vr z|NmdTnCUB!&zR)x?!qj{(-$`QwD zT|gm$nC}Q!>*kackf&D-#7d17t&Rep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&9m Lu6{1-oD!M<7Q$b( literal 0 HcmV?d00001 diff --git a/data/flags/luik-shield-large.png b/data/flags/luik-shield-large.png new file mode 100644 index 0000000000000000000000000000000000000000..f7cf4510f89562a17afe4d055417982373711788 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7T3?v)swEqJsmUKs7M+SzC{oH>NS%G|oWRD6+FBlj~4Hy_+B``2p&0t^yP}G$AKKq0*}aI1_o|H5N51TiJu4* zWH0gbb!C6fD8izyy4h`+3{c3@)5S4_<9f0{3nL?&qN=KDs<^@e?#Y6uN>UCSWYG*` z({@cXYMQA~$;RfWm@4kbXfU}kFhIbCkwMBvI_<8BPz}%!)e_f;l9a@fRIB8oR3OD* zWME{hYhb8rWDsItVr6V;Wo)i(U|?lna3kiZEQ*HQ{FKbJO57S&GS)5xYGCkm^>bP0 Hl+XkK&Ej8f literal 0 HcmV?d00001 diff --git a/data/flags/luik-shield.png b/data/flags/luik-shield.png new file mode 100644 index 0000000000000000000000000000000000000000..31d30025de8bf22228f78741459712ad87b11bcb GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8V1#6XN=x;XjahOGxU^ zUC#gi|JP`4KLq46mIV0)GdMiEkp|)`*1adeFJR*x37`O#Nn6W-3ej-qi zy~NYkmHj!R2#dPP5yxp=Kp|~U7sn8e>&XHw3~Y+3s;SAz&WkeL40IbDnMF02mkOFJ zp0G(VK;nb|OAy1cKirKQY>ztuwW*f4MwFx^mZVxG7o`Fz1|tI_V_gG7T_b}K0~0G_ sODkhDZ36=<1A{v4b1P9a>h>FVdQ&MBb@0J0fdaR2}S literal 0 HcmV?d00001 diff --git a/data/flags/luik.png b/data/flags/luik.png new file mode 100644 index 0000000000000000000000000000000000000000..b38c753735a4fa629bfae92d6fe861e238ab8b49 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}t!VDyvH)($XQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIh~|NnjdzJGv1j7i?^E-d{SHv@qj&H|6fVj#T=gc;em3jBc#_7YEDSN7+OA}s34 zQL4C_cSFe$l+mITvK8v#lR4} zT;4KHMeHFtIYWv@$l;HZZU + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/misc/flags-large.spec b/data/misc/flags-large.spec index ef9aa87ce0..e269c32c52 100644 --- a/data/misc/flags-large.spec +++ b/data/misc/flags-large.spec @@ -304,6 +304,7 @@ sprites = "f.lithuania", "flags/lithuania-large" "f.lombardy", "flags/lombardy-large" "f.lorraine", "flags/lorraine-large" + "f.luik", "flags/luik-large" "f.luna", "flags/luna-large" "f.lusatia", "flags/lusatia-large" "f.luwian", "flags/luwian-large" diff --git a/data/misc/flags.spec b/data/misc/flags.spec index a077f22970..ad42ea9b75 100644 --- a/data/misc/flags.spec +++ b/data/misc/flags.spec @@ -302,6 +302,7 @@ artists = " Lithuania Christian Schaller Lombardy Flanker (Wikimedia Commons) Lorraine J.M. Maalderink + Luik Jed (Wikimedia Commons) Luna Daniel Markstedt Lusatia J.M. Maalderink Luwian Andrzej G. @@ -875,6 +876,7 @@ sprites = "f.lithuania", "flags/lithuania" "f.lombardy", "flags/lombardy" "f.lorraine", "flags/lorraine" + "f.luik", "flags/luik" "f.luna", "flags/luna" "f.lusatia", "flags/lusatia" "f.luwian", "flags/luwian" diff --git a/data/misc/shields-large.spec b/data/misc/shields-large.spec index 599b12f3a7..6b8c8e8246 100644 --- a/data/misc/shields-large.spec +++ b/data/misc/shields-large.spec @@ -304,6 +304,7 @@ sprites = "f.shield.lippe", "flags/lippe-shield-large" "f.shield.lithuania", "flags/lithuania-shield-large" "f.shield.lorraine", "flags/lorraine-shield-large" + "f.shield.luik", "flags/luik-shield-large" "f.shield.luna", "flags/luna-shield-large" "f.shield.lusatia", "flags/lusatia-shield-large" "f.shield.luwian", "flags/luwian-shield-large" diff --git a/data/misc/shields.spec b/data/misc/shields.spec index 6810afcc51..2ed79bf52b 100644 --- a/data/misc/shields.spec +++ b/data/misc/shields.spec @@ -303,6 +303,7 @@ sprites = "f.shield.lippe", "flags/lippe-shield" "f.shield.lithuania", "flags/lithuania-shield" "f.shield.lorraine", "flags/lorraine-shield" + "f.shield.luik", "flags/luik-shield" "f.shield.luna", "flags/luna-shield" "f.shield.lusatia", "flags/lusatia-shield" "f.shield.luwian", "flags/luwian-shield" diff --git a/data/nation/Makefile.am b/data/nation/Makefile.am index afce5b1e28..e34bcb9ada 100644 --- a/data/nation/Makefile.am +++ b/data/nation/Makefile.am @@ -289,6 +289,7 @@ pkgdata_DATA = \ liburnian.ruleset \ libyan.ruleset \ liechtensteiner.ruleset \ + liege.ruleset \ ligurian.ruleset \ lippe.ruleset \ lipkatatar.ruleset \ diff --git a/data/nation/liege.ruleset b/data/nation/liege.ruleset new file mode 100644 index 0000000000..712316b7d3 --- /dev/null +++ b/data/nation/liege.ruleset @@ -0,0 +1,77 @@ +[nation_liege] + +name = _("Liegean") +plural = _("?plural:Liegeans") +groups = "Modern", "European" +legend = _("Liege was constituted in ecclesiastic principalty in 985,\ + when Bishop Notger was granted the control of several cities in current Belgium.\ + As a federated state of the Holy Roman Empire, it was characterized\ + with large civil liberties for which liegean struggled strongly for.\ + It lasted until 1792, when the recently formed Republic of Liege voted\ + the union with revolutionary France.\ + Liege played later a major role in the Belgian independance.") + +leaders = { + "name", "sex" + "Notger", "Male" + "Wazon", "Male" + "Albert de Cuyck", "Male" + "Érard de la Marck", "Male" + "Jean-Nicolas Bassenge", "Male" + "Joseph Bologne", "Male" + "Julienne de Cornillon", "Female" + "Théroigne de Méricourt", "Female" +} + +ruler_titles = { + "government", "male_title", "female_title" + "Monarchy", _("Prince %s"), _("?female:Princess %s") + "Democracy", _("Prime Minister %s"), _("?female:Prime Ministress %s") + "Fundamentalism", _("Prince-Bishop %s"), _("Mother Superior %s") + "Republic", _("Regent %s"), _("Regent %s") +} + +flag = "luik" +flag_alt = "belgium" +style = "Celtic" + +init_techs = "" +init_buildings = "" +init_units = "" +conflicts_with = "belgian", "walloon", "flemish" +civilwar_nations = "belgian", "walloon", "flemish" + +cities = + "Liège", + "Tongeren", + "Huy", + "Dinant", + "Maastricht", + "Bouillon", + "Ciney", + "Thuin", + "Fosses-la-Ville", + "Couvin", + "Châtelet", + "Sint-Truiden", + "Visé", + "Waremme", + "Borgloon", + "Hasselt", + "Maaseik", + "Bilzen", + "Beringen", + "Herk-de-Stad", + "Bree", + "Stokkem", + "Hamont", + "Peer", + "Verviers", + "Seraing", + "Herstal", + "Ans", + "Chaudfontaine", + "Fexhe", + "Awans", + "Waroux", + "Amay" diff --git a/meson.build b/meson.build index 31dcf56628..2ac9d604c8 100644 --- a/meson.build +++ b/meson.build @@ -1379,6 +1379,7 @@ nations = [ 'liburnian', 'libyan', 'liechtensteiner', + 'liege', 'ligurian', 'lipkatatar', 'lippe', diff --git a/translations/nations/POTFILES.in b/translations/nations/POTFILES.in index d23377e03e..2dee7b88a0 100644 --- a/translations/nations/POTFILES.in +++ b/translations/nations/POTFILES.in @@ -252,6 +252,7 @@ data/nation/liberian.ruleset data/nation/liburnian.ruleset data/nation/libyan.ruleset data/nation/liechtensteiner.ruleset +data/nation/liege.ruleset data/nation/ligurian.ruleset data/nation/lipkatatar.ruleset data/nation/lippe.ruleset -- 2.39.0