From 607ef4f8281f8a2c561d15f1683326a2a4c3d7ba Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 6 Feb 2022 07:21:41 +0200
Subject: [PATCH 47/47] jbonai.svg: Update to inkscape 1.1.1 format

See osdn #43792

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/flags/jbonai-large.png        | Bin 1022 -> 1253 bytes
 data/flags/jbonai-shield-large.png | Bin 759 -> 705 bytes
 data/flags/jbonai-shield.png       | Bin 520 -> 515 bytes
 data/flags/jbonai.png              | Bin 746 -> 889 bytes
 data/flags/jbonai.svg              |  35 +++++++++++++++--------------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/flags/jbonai-large.png b/data/flags/jbonai-large.png
index 366a92e0f954c0f62d796b2063aa8fd303f34b13..04ef84d903554ac0d92aaa5fceee6ab814831a41 100644
GIT binary patch
literal 1253
zcmZ`%X;4#F6ut?23_DI(Dq8`Sg!CCV3{;8(O7MYbDMhAW5+DdDC`6FJj8LqFXs2ia
zt)N0hrL+~JLU9{Gqkt?fMGUBnhzqsIRB*-R>wEpzA3bx={pOsx-#y>C=axoAF0<r0
z^9Ui9vapa<42l?cH8)~*`6$1F0ppb5h+sl=-%op|Fkxc%#IRKnglK#SDcnlP6q70(
zC1evt$P+ms(mjL-HdLQp8Au4{Ruml_${YY=@86@M0+p3`{1{eN;Pdg|0oJaChsWEu
z7$3)n55TKepy{3-q^82%9UKlAs)-3iB4{+Ye;>oc$jgIJ2rif5AuSEPy?FKvadF7V
zKy@`58rTYQIqd9UZjJ#T+Tcyw+q0GT?Sq>e;^Q$f!Ah{P!Mk^uoW$nMI6>(AeC*xJ
z>hkkrRV-Wx7Z=>R1*H;w9MK;fQF1bF-h{I=7A?Z-*VwiVrl#ob#;H?yX(c#&7M-0a
zEyar$2n+-Sf`9;|r^D73FJFS`t+5dU18m3j^*D40BO@3b#PQ=mZ7rIc)oOTp;_zXN
zjbYO!K&L}l8LRL5b+(?F8Dz3v7y7b2eP=fPyD@#&mqvIv+o42)t}fiTamkL(&c@TH
zICcz2j^N-y^!MY$39MfasT3t8xN-$&&fwfRw6{a6Wgot;4^B>a^9DIN*u5K;mJo|E
zI*K)G;OdI1DwLOl$HU-E+QI?}30SudGiIQm07gc*b`68V=jWNxa+J%Lg>b<28)5>B
z4PmRZ3E|qZ&UxtP(ZeLo)Ut?BvqxN06Ng!m$4A<klue={GKaxv#{C)p*R01Ji<tYG
zWFf)P{#}W3cMD3%p=m?N##t(rN5UMTOMuyR?V?jH{-rCsdoFf$=-aPeZP#~nUHoo^
zuCS);SV{e!7UQ7vb>%1POLqKP9cXolr@gQw{EBZw+7su!an6HjQs2|z8p)KY!NEoA
zG~1<kwa;Od>XDDlm#bsroRq%J&AO)I(!l_KX`7)}d^E#Rd-u~o#YBSV(2(b1YJX$B
z+iB&NkG)%Ne`UlqiZ8x*=U!P<^d-fxr!CbPHeBD@x^~#nF(}4M%$IG9Em)$oyHl5B
zyT7&7Vdt!t!l<-3jVZlR6_XR0;Tpt$Aox2aWm4d9!DJ$9yLNeat+p#_y5J|Fcv%cT
zYw0(lU2}b(`5V=p<qZ_yEGn9BZr!i#^T@aPNd2OuCf%HWGT3;ZyXM*)$pX#1wxp`y
zoj156P1<IKzNYGz?Q`j&&NkhQ%j2W`Cl@NqM1JlThML>mG;f!oC13M)O6R?@*g|6e
z*UX>ke(N74Uu4I1Jn!`VLDgNZTi8|^QuNtkf7w#~!OR%1pe;M{4t(1&R_BymR;No6
zE{$zg>JR)TFEsF{nR-n(@tQ7a+5U+gAs!FoYupz6sbnVUtqzS<Cn?m)(!{J}28e``
zNc<>fEr_P(OC^+a9wnqGDMjh;=~w)Rus$;>Rh9Sugr;)^lMKO$t?+rKN}a37N+!9v
hx#HA}^z1~%hGcPOR!Y@)pfmfSWTBBEN0-RI{s+iZO#T1>

delta 966
zcmaFL`Hy{qWIY=L14FpkpXES`Ey>&61xN$IPv_nBK#H@#BeIx*f$=>EGZw2D27?64
z3LMjcbO;bzFiZ{d7G_{zX7Y4#42d{=HNwz8$x+~6n4q+<>aiz@s#9AlG=zL}dRnJ@
z>nu@Nxapaf^_Gnr6h87ZToXIyC4H#=sgBOs;6TeQ8y;DCm^kWkta!LP$zi8(td0E6
z$KG+9@{RJJRd3#Gyn8i+KrV|k!vwM7bvJ`g1#R}yEZL&M^KplbZUd8pxAL6RjE4^!
z?c2jL$M5xtZ7PSdvkx3-u*uGzHv4}-i|2!9Yy}ptSiXOEFwl5^`*y?Ke^XAkGF`a-
z{d@h&wNoa!ewUjwpLzD|10M}1crk9@ZuDAMxZ(VA0j|=+D_%Y0zI)?F#kI3f8}8kk
zrMF=R$Bw(YT^}ARZ`h}|`Aq>saPXrWPnq=eS}r_Pyl|Cu4)0G!hGhHlj~^I({JP$q
z;Fxf>Yh9+-k?`=w0*MW#f>xn(rCv=qKRHhS=1osM{mJ!9gOc~I);1DQDBpM>R>wd<
zAX0gXSBiy>+1|L13z=8hI<J25eR7-QtY!ByRGgMgZO?p~sIus~x$nle-=keBvb$MM
z%$41H(5G$7?UTFZn#*n3-j+>#xnZ-i-L`FZ9y>yme*Zq15b%DAN_v{d_StJB*tFXm
zw@0U(Rge&gU%zzry!wKrPM4?H+gn_))|slZYokPJA8+%<87J;31s*=w_`}He<6o(V
z(|enzY@6kyG<DL|*B@Vm7g*`4-gsU;?PraW_wujzt8E@>Pi30m!`04q_4W5n(@ruh
z6ey_TI&=2n8+Udt)`YUK_Xe}4O4-`;m(=`cV^~r1ugS$JYwhW!+c)mluU9R86U=(!
zHuJILjlH}HC0|yq*_!tGa?+j?vB#29ln!Q0*>dwlQsDgNtu^*mRp%ZqUc771l?4$Z
z@fS5tx;R<<nRq(mxa)VT#BI@$s~4@6a_9XYoSnDI>&W8+4-^b+dDpCAcv_Ua_jUGz
zCoCt5I3oETK5<Fu4bWpgeLAVQV8c)0`q10C`uA%eRa7(U*B<|&)$;jcthf1xde<Ft
z{~vXHS?ISsME2&agiOz<8a3s|R%Lw0kFVFd^=`)hcg`!s{Fbjdck4z{gnZ(HrQxAm
zxn+_+xWg@eo_>4k1Te=isFt`!l%yn<q*^5xr2;7iBLhQ2T>~Rs1G5k#11kdqD?>|b
iT>}ds>)}y34ip`^`6-!cmDqGZG)$PWY|G>=EQSCPwz5(H

diff --git a/data/flags/jbonai-shield-large.png b/data/flags/jbonai-shield-large.png
index 9098f968d27a7b09023230f0387e5835d6fc413f..faab2fcb40107518fe7bdba749c3c007a3e172c3 100644
GIT binary patch
delta 635
zcmZ{fT}V>_7>19lli8#nm6h0qmM4`I&sIt<aT;4Toy(tvP9)PdNyWeINJiQzD=3t+
zWEb5TOvkbd(Q1@*Q_wc8#EHoKM<PXY8WA}y+uPYqcYS;xAMXnfFRzb$M?Q+&yNe(Q
z1?Tj4#e{cdC9;$GDvbgJco+OkPh(~VLLodJjEo>U+V6+eiu80)6yoC{7NfHhe~wcf
z9iVB%#=>U9&JIdSP*#S81$ezM7%(TG7zXR>n4gDMi_%iGwjw77zjlY@=7MFBkbv!N
zI2<h0YJenFD!5!|YC>BZdVA5+gT_W|L{NO}>H%u=C<TGQVnIU#oK6f6V`~d@b68u$
z>@13lk&yw31SS(W4smgi$<Wt_#oA{}e61j+P+df1E>BejL}hNaTu>!!)$t;v@dB$g
z5`^$j;DT6Pc^B^nGs-+g@UmbJ8Ih1?pD5rhmr|akIWnPld&1i3gQVMAS}+(R@(M%)
zzWymc%&OF<pIXXa8=vb=d|Z@;x-YI2-4bzfB#KO=N*P;JBQ=jMT}smC-&=JQMh;eL
zYMbAme_=J&de{{cS3T|-7;3(0*$n2+Mp$izsPXSDpH+1=r|N&)A2!%8C-sfqHAbbq
zBAvH4W`{WY;ib0^?_|09)3!MAwG`6>n|AU{Om{L>5xTE9?`Qq=8=t#7`4}8ed^zTo
zZ;m*Qcqtnk%ly)=U-+sI%b(wGH}jn+Mp44(^c9R=desnkgoKtzl4yQYHFSzpLQ7AJ
oPtvrMrYj$h{r*P;fVu`<b=8gk1K}U8XY&A|RH)_s=dQH>1+JtlTmS$7

delta 688
zcmX@e`ki%xBnKM<14B`O*_nxo!d#5SLGDfr>(0r%oM@<D&z9uv?gEqrf}hU2>wy$!
zfk$L90|U1J2s5r#-dhS1EGuwK2hze|{IR}g9Rma7bx#+^5R21mr|kDq4iq_7Up_-1
ziEHtOR*ABnP!HXxnM%GalhZj=&Oa!=;qt*y=!0O6N~y}U)lEm6+&EY|&uu?is8&B&
z@~qfy`IvV<?eEXDOqWskCv3yu`TBgyr|UB~qPllmXC@zhXUg!T*4>iFzV)TZwry|x
zZtc%DK2*S=t{$-Rz(2byuL}&VSnfYhD)HEx_s#3*qqf62j;#x?y!BeX{8EKZ>%zeL
ziV0P=FYj?*c|B8aX1&d}A9>fm>^OVc`^58yuj;w7ObgD<3(`BB#At1^F=7Vav-MYX
z?B;L(Gb3`V*4eb1)2*aDd)rj*hc8a7lG;2oWUbl^Sy{)8Gv5CHC3P!z^6lKqmo>z6
z<qt5<n#N>izPa)I`2Y=vhu>{K%iGU9pIB`z{rwl$(wF+#n=k*YDm!=n?TPQxKZ(C6
zS>u~>`-}g3p85$Fiq4%ox9JN%-y80I?Q%~yz06ek{3t0u|3cQmx4JH?zy09YDPyzI
zSucIp+xbVgMors3r`u(9bK{j9uj=X`0gvOygZArda$I>oTaM*fzS+`)2{#vA$l9o4
zXJ^+sTROA+`nx5z8y^Jn>L0wYGvf=R{--HkA3i0OU*fZPE>JYntbQ`jV&P<?$V8#v
z!8`r3>$dPsFI;Ef`H<f_&|_xgjr~V~@vU0o8c~vxSdwa$T$Bo=7>o=I4RsBSbPdcx
vj0~&{46KZRYzrVG*Vk7NMMG|WN@iLmZVfX00$<kxbuf6k`njxgN@xNA2*@RL

diff --git a/data/flags/jbonai-shield.png b/data/flags/jbonai-shield.png
index b4608db21db077d28a4b0e7329adaafdb136eed5..0953d7fa84bf05584f2dea1b19e192e228adb4a4 100644
GIT binary patch
literal 515
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$DhBC&cwX!+#+2KM>rz
z_rIp*`0@W~Y5!AG{~s>fbmGMS)vJMG|9}1ZKgDS7RO7i-RsYwn{T~za|Jt?x2W)Hh
z+tysa{(ndIrvIBZZOh#B&Mo|%Yxwr8O>bSoZ`}Al*=X+1pZ_Z={vRpdBr|!D7tk8U
zk|4ie28U-i(m<RfZ+91_H13)dAcwQSBeIx*fm;xS8S7KxCjtf8OFVsD*`G17v5KhQ
z<NX%~6squaaSY+O9(wMzP?G}(YeE9=wku(|#h3M-{obF_aLwnB<!8e)k_`XZCgeDM
z__1kKosEHa&!Hldd9T`5*b1Aj4E|PS67wl^ad_X-DYs3c?+7xO9{-sbQu%el=gZww
zJy*x+Ui@UnwCTjIt_`Qx|LyH<$nbxp7ysr5gTysfaZBxK-+*pVEpd$~Nl7e8wMs5Z
z1yT$~21Z7@20&yMVqj`zWME}%scm3jWnd7!x1$wBLvDUbW?Cg~4O$NjEP)yrJYD@<
J);T3K0RRL_$1MN=

literal 520
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7a$D;Kb?2i11Zh|kH}&M
z25tcmW?ZYhw-h8;R^XTpq`~?bHb#H^&cMKE=;`7ZqH%uiq>bKAfg;E1pDS|oDz1C<
zW7#r;@`YjB&8Pq1-!bFdB{7y~0#ENKS(sUQ_BGlp^ereVDlGVzy<^|=>P$h|9Wi?M
zf1b1aUNfKZk^Dr)34I06i_68i*eA?<_&4Iy%ae2OTQT{l>7D=V(DeFpF~cuYgXXtl
zuSzwh3LQDfa4h-7SB2T72Oi%PYIx57{a((3t4&9f?uR-q2x(bpqGfKXWiHy5sl%b-
zAlVR=$8q>b+`R{no(MO5Z&&<xRc`gu2cjQZ)?8ZqFS5;Rd)I`S0&SX_Cv(_N&yHsJ
zq+kA{E{aRB`)P*B9VUhv`DL$_E|(gr<(lcK=Q5;}<wvdEGX1g9`+rj=EWTfUm%+#S
zc&+^OvfFp(o;x^0Gs&fGF01e~W8+09AH~RitO!vMvvTZs#4Yf8dPK5$y%sPeRZCnW
zN>UO_QmvAUQh^kMk%6J1u7Q!Rfmw)=ft7)Qm7%$=fd!DU@mFdniiX_$l+3hB+!_un
SzxxuXfx*+&&t;ucLK6V!M#gdg

diff --git a/data/flags/jbonai.png b/data/flags/jbonai.png
index 1384a96a65841588f4bd41a7712db0c6a84fd8b7..978edc881265c689dbdcf3356651c65b27e7abad 100644
GIT binary patch
literal 889
zcmZ`#QB0Fp7`=a`B1NQ%MvKu59o=f7`CB%qt&ve$+OigHt<aLiP)ZBvfKrRKBx*%W
zM1NA3Md%{31(-szOtB^)5611m2sU#;L*~?xfX)pFXfjB)fyaw)KKSLHd+v8~PQH6@
z%ibb=k|0$;2uU&;v{uSnDAuo9LH7d9oq0-em3ihoLi)pri%vf6KX4hWW<napgoK(2
z`HxDWzX)ky37IM*L=_=qqqk$ovWpN#z1L*ZQ3Gf_eTwmM2!(j^1kor`QeMBtwQI23
z!LrE7fyaa4VL&9hdlzmu91isNV|Er=E%xle&=6j{z~m%)dy$oesW?$zA8y`+*$jgL
zb8}c+L~bs^Vbs)Mo|owJp|utH`B+*)R~Jf4F**vF4B+uHGVt&rN=nev1I*0ayN5sk
zkqFw_5DcQA0Lzms7F1O=C38z>IdEKugnL%cfng@S+@&4dDIo`qhTdkPj_Z_iIvqwv
zaP%nJ+i~Fn8XKY4qq`eYDaOWNv*GgPWxLl4zaK3vFqtqoh=~bI^F;~;u3W*u016B7
z@+Gcchg=S&5|x#>aRd2Q<v9I5ru=igmH{vG585Pn4UWT9vn_*(+w^@K732Lzvo8Km
z-b(&@ai8Fq+f)*|oJB_{XH$Gg@wTJ`cV5xMbE7uT_VImJ+3n;_Uok0yWOLg$r#FN%
zHmf%mJJuA*YPTNPeVobLTASuvV{@#v$m<h~l4?=4!<eu$$k$ak(%l=_lKti_rbAT+
z(}oXDhxiTi|0J#cDPy~<`G=NXi9HtkV*KZIv5BbS<Vfk`-+q6j4u!hEj-Hc7+;g7k
z*^}bwsb@2PpB5*6^5}8=mz`I?y>)^_(uGw`-u>s-+GD?dmaB}536k=C(c;0Cc2<+Q
z&ZG}+|No3d&Z-KwWpirT?zG}<a*0Hg*|D$L`e4-j@3GMb)&_;)9KXC=n6>bVAs;P>
zRbz=OzM~IL_v`Hb3a8(#a{1hph=NrpGFiH^ZS1Ei1*^(ZN?BILvP&bU<nIJ(>ME)|
z!S@Hac6BQah?XbptMm8+PM@0u0s&cd?V-air`Ij3^HpA)-IYpB#HcIM{-`NydIJQ3
BeMtZS

delta 688
zcmey#_KJ0aWIY=L14H2)v*SRDEy>&61xN$IPv_nBK#H@#BeIx*fzb|x8I4l8+ChS4
z1&--J+6;(Q7|bMh$OC2HdAc};cpN`F&CokKP~>>M`B{ON0UVl>^mv!}&RXec(6mED
zHbg^Y`u05+`5y#ra2C9*e}R8NvSNKchlreGd(&)zSd)@~L(Ms2Ee*O?mRA1fGrw@{
zyVET78~>&qemdvB<@3GO?`qF8JnHjg_TYTQ#wgM)e7eVQiO^Ol76aqtT&78)w)X8S
zHM4~$$cb;*&tF|#P?PieO4b95)gi``esXIc?QLAFyklS6&B%zz#-~p|wu&CVI`zq}
z`b&qJo>T^H*DkfX^ln|qN{@J>{?L^-N|z`9otOSN_WG;G2^Kpx`W>IRZQGKA3a?gQ
zU%GxJ`>N}U_Z>X&N+$i#qO;4k?9gaU3@Is7o9Z>`-O^C4n_qnoU3fM7?2knk9bbLV
zG)X8H?&*Bj`u^}QtAsUQ|7P?UhTYG&QL~u+<)cGsn)M<Tbswhu)cRmK>%&9#8MB!W
zO_+YL`qtYYg>(M%y=8uoD_&)L<7Q)xoJUnk-pTcHpDQ!AF1Y{vi_z&s-f7boHJz4!
zz&&qi++%Tb1OJBJj5`n2EovF}ymmH|{`jB0nPtsdM?Lo2w*}hjf1OG#i2bqb_l|Y3
z|NSJQV)fEL_dGhMU(ar=W3_4Vk8FWe>$&FCym?qTIkq{ig3r`&?KBhH+_x<~cP?+7
za{AlFyu26jM&G{nJrR>HJZ%3X_9y2fxntX;Pc|0<lYwf9YeY#(Vo9o1a#1RfVlXl=
yG}JXP(lsy(F*2|+Ft9Q-(KWCDG8%;HPatbhwaU#;$xN%nt>dHr@si0N%!UA^PcPB{

diff --git a/data/flags/jbonai.svg b/data/flags/jbonai.svg
index 84850f2e5f..f39d225f62 100644
--- a/data/flags/jbonai.svg
+++ b/data/flags/jbonai.svg
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   baseProfile="tiny"
    viewBox="0 0 300 200"
    width="300"
    height="200"
    preserveAspectRatio="xMidYMid"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
    sodipodi:docname="jbonai.svg"
-   sodipodi:docbase="C:\freeciv">
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata25">
     <rdf:RDF>
@@ -31,8 +29,8 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="579"
-     inkscape:window-width="847"
+     inkscape:window-height="622"
+     inkscape:window-width="832"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      guidetolerance="10.0"
@@ -43,11 +41,14 @@
      pagecolor="#ffffff"
      id="base"
      inkscape:zoom="1.885"
-     inkscape:cx="150"
+     inkscape:cx="149.86737"
      inkscape:cy="100"
-     inkscape:window-x="110"
-     inkscape:window-y="145"
-     inkscape:current-layer="svg2" />
+     inkscape:window-x="362"
+     inkscape:window-y="85"
+     inkscape:current-layer="svg2"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:window-maximized="0" />
   <defs
      id="defs4">
     <circle
-- 
2.34.1